Skip to content

Commit

Permalink
reset: the command takes committish
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jul 9, 2012
1 parent 75f5ac0 commit 13243c2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions builtin/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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
* be a filename.
Expand All @@ -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);

/*
* 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);
if (!commit)
die(_("Could not parse object '%s'."), rev);
Expand Down
2 changes: 1 addition & 1 deletion t/t1512-rev-parse-disambiguation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ test_expect_success 'git log takes only commit-ish' '
git log 000000000
'

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

Expand Down

0 comments on commit 13243c2

Please sign in to comment.