kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

reset: the command takes committish 

This is not strictly correct, in that resetting selected index
entries from corresponding paths out of a given tree without moving
HEAD is a valid operation, and in such case a tree-ish would suffice.

But the existing code already requires a committish in the codepath,
so let's be consistent with it for now.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2012-07-03 10:04:22 -07:00
parent 75f5ac04a2
commit 13243c2c7a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/reset.c
View File

@ -276,7 +276,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
* Otherwise, argv[i] could be either <rev> or <paths> and * Otherwise, argv[i] could be either <rev> or <paths> and
* has to be unambiguous. * has to be unambiguous.
*/ */
else if (!get_sha1(argv[i], sha1)) { else if (!get_sha1_committish(argv[i], sha1)) {
/* /*
* Ok, argv[i] looks like a rev; it should not * Ok, argv[i] looks like a rev; it should not
* be a filename. * be a filename.
@ -289,9 +289,15 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
} }
} }


if (get_sha1(rev, sha1)) if (get_sha1_committish(rev, sha1))
die(_("Failed to resolve '%s' as a valid ref."), rev); die(_("Failed to resolve '%s' as a valid ref."), rev);


/*
* NOTE: As "git reset $treeish -- $path" should be usable on
* any tree-ish, this is not strictly correct. We are not
* moving the HEAD to any commit; we are merely resetting the
* entries in the index to that of a treeish.
*/
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
if (!commit) if (!commit)
die(_("Could not parse object '%s'."), rev); die(_("Could not parse object '%s'."), rev);

2
t/t1512-rev-parse-disambiguation.sh
View File

@ -121,7 +121,7 @@ test_expect_success 'git log takes only commit-ish' '
git log 000000000 git log 000000000
' '


test_expect_failure 'git reset takes only commit-ish' ' test_expect_success 'git reset takes only commit-ish' '
git reset 000000000 git reset 000000000
' '