Skip to content

Commit

Permalink
sha1-name.c: for ":/", find detached HEAD commits
Browse files Browse the repository at this point in the history
This patch broadens the set of commits matched by ":/<pattern>" to
include commits reachable from HEAD but not any named ref. This avoids
surprising behavior when working with a detached HEAD and trying to
refer to a commit that was recently created and only exists within the
detached state.

If multiple worktrees exist, only the current worktree's HEAD is
considered reachable. This is consistent with the existing behavior for
other per-worktree refs: e.g., bisect refs are considered reachable, but
only within the relevant worktree.

Signed-off-by: Jeff King <[email protected]>
Signed-off-by: William Chargin <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
wchargin authored and gitster committed Jul 12, 2018
1 parent a42a58d commit 6b3351e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/revisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ existing tag object.
A colon, followed by a slash, followed by a text, names
a commit whose commit message matches the specified regular expression.
This name returns the youngest matching commit which is
reachable from any ref. The regular expression can match any part of the
reachable from any ref, including HEAD.
The regular expression can match any part of the
commit message. To match messages starting with a string, one can use
e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what
is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a
Expand Down
1 change: 1 addition & 0 deletions sha1_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,7 @@ static int get_oid_with_context_1(const char *name,
struct commit_list *list = NULL;

for_each_ref(handle_one_ref, &list);
head_ref(handle_one_ref, &list);
commit_list_sort_by_date(&list);
return get_oid_oneline(name + 2, oid, list);
}
Expand Down
26 changes: 26 additions & 0 deletions t/t4208-log-magic-pathspec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,32 @@ test_expect_success '"git log :/a -- " should not be ambiguous' '
git log :/a --
'

test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
test_when_finished "git checkout master" &&
git checkout --detach &&
# Must manually call `test_tick` instead of using `test_commit`,
# because the latter additionally creates a tag, which would make
# the commit reachable not only via HEAD.
test_tick &&
git commit --allow-empty -m detached &&
test_tick &&
git commit --allow-empty -m something-else &&
git log :/detached --
'

test_expect_success '"git log :/detached -- " should not find an orphaned commit' '
test_must_fail git log :/detached --
'

test_expect_success '"git log :/detached -- " should find HEAD only of own worktree' '
git worktree add other-tree HEAD &&
git -C other-tree checkout --detach &&
test_tick &&
git -C other-tree commit --allow-empty -m other-detached &&
git -C other-tree log :/other-detached -- &&
test_must_fail git log :/other-detached --
'

test_expect_success '"git log -- :/a" should not be ambiguous' '
git log -- :/a
'
Expand Down

0 comments on commit 6b3351e

Please sign in to comment.