undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: disallow "reset --keep" outside a work tree

Browse Source 
It is safer and consistent with "--merge" and "--hard" resets to disallow
"git reset --keep" outside a work tree.

So let's just do that and add some tests while at it.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2010-01-19 05:26:00 +01:00 committed by Junio C Hamano
parent 7349df1142
commit ab892a19e8
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-reset.c
View File

@ -319,7 +319,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (reset_type == NONE) if (reset_type == NONE)
reset_type = MIXED; /* by default */ reset_type = MIXED; /* by default */
if (reset_type == HARD || reset_type == MERGE) if (reset_type != SOFT && reset_type != MIXED)
setup_work_tree(); setup_work_tree();
if (reset_type == MIXED && is_bare_repository()) if (reset_type == MIXED && is_bare_repository())

25
t/t7103-reset-bare.sh
View File

@ -11,21 +11,26 @@ test_expect_success 'setup non-bare' '
git commit -a -m two git commit -a -m two
' '
test_expect_success 'hard reset requires a worktree' ' test_expect_success '"hard" reset requires a worktree' '
(cd .git && (cd .git &&
test_must_fail git reset --hard) test_must_fail git reset --hard)
' '
test_expect_success 'merge reset requires a worktree' ' test_expect_success '"merge" reset requires a worktree' '
(cd .git && (cd .git &&
test_must_fail git reset --merge) test_must_fail git reset --merge)
' '
test_expect_success 'mixed reset is ok' ' test_expect_success '"keep" reset requires a worktree' '
(cd .git &&
test_must_fail git reset --keep)
'
test_expect_success '"mixed" reset is ok' '
(cd .git && git reset) (cd .git && git reset)
' '
test_expect_success 'soft reset is ok' ' test_expect_success '"soft" reset is ok' '
(cd .git && git reset --soft) (cd .git && git reset --soft)
' '
@ -40,19 +45,23 @@ test_expect_success 'setup bare' '
cd bare.git cd bare.git
' '
test_expect_success 'hard reset is not allowed in bare' ' test_expect_success '"hard" reset is not allowed in bare' '
test_must_fail git reset --hard HEAD^ test_must_fail git reset --hard HEAD^
' '
test_expect_success 'merge reset is not allowed in bare' ' test_expect_success '"merge" reset is not allowed in bare' '
test_must_fail git reset --merge HEAD^ test_must_fail git reset --merge HEAD^
' '
test_expect_success 'mixed reset is not allowed in bare' ' test_expect_success '"keep" reset is not allowed in bare' '
test_must_fail git reset --keep HEAD^
'
test_expect_success '"mixed" reset is not allowed in bare' '
test_must_fail git reset --mixed HEAD^ test_must_fail git reset --mixed HEAD^
' '
test_expect_success 'soft reset is allowed in bare' ' test_expect_success '"soft" reset is allowed in bare' '
git reset --soft HEAD^ && git reset --soft HEAD^ &&
test "`git show --pretty=format:%s | head -n 1`" = "one" test "`git show --pretty=format:%s | head -n 1`" = "one"
' '