mirror of
https://github.com/git/git.git
synced 2024-10-19 04:48:10 +02:00
refs: allow "HEAD" as decoration filter
The normalize_glob_ref() method was introduced in 65516f586b693 (log: add option to choose which refs to decorate, 2017-11-21) to help with decoration filters such as --decorate-refs=<filter> and --decorate-refs-exclude=<filter>. The method has not been used anywhere else. At the moment, it is impossible to specify HEAD as a decoration filter since normalize_glob_ref() prepends "refs/" to the filter if it isn't already there. Allow adding HEAD as a decoration filter by allowing the exact string "HEAD" to not be prepended with "refs/". Add a test in t4202-log.sh that would previously fail since the HEAD decoration would exist in the output. It is sufficient to only cover "HEAD" here and not include other special refs like REBASE_HEAD. This is because HEAD is the only ref outside of refs/* that is added to the list of decorations. However, we may want to special-case these other refs in normalize_glob_ref() in the future. Leave a NEEDSWORK comment for now. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
bbea4dcf42
commit
b877e617e6
11
refs.c
11
refs.c
@ -455,11 +455,16 @@ void normalize_glob_ref(struct string_list_item *item, const char *prefix,
|
||||
if (*pattern == '/')
|
||||
BUG("pattern must not start with '/'");
|
||||
|
||||
if (prefix) {
|
||||
if (prefix)
|
||||
strbuf_addstr(&normalized_pattern, prefix);
|
||||
}
|
||||
else if (!starts_with(pattern, "refs/"))
|
||||
else if (!starts_with(pattern, "refs/") &&
|
||||
strcmp(pattern, "HEAD"))
|
||||
strbuf_addstr(&normalized_pattern, "refs/");
|
||||
/*
|
||||
* NEEDSWORK: Special case other symrefs such as REBASE_HEAD,
|
||||
* MERGE_HEAD, etc.
|
||||
*/
|
||||
|
||||
strbuf_addstr(&normalized_pattern, pattern);
|
||||
strbuf_strip_suffix(&normalized_pattern, "/");
|
||||
|
||||
|
@ -1025,6 +1025,12 @@ test_expect_success 'decorate-refs and simplify-by-decoration without output' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'decorate-refs-exclude HEAD' '
|
||||
git log --decorate=full --oneline \
|
||||
--decorate-refs-exclude="HEAD" >actual &&
|
||||
! grep HEAD actual
|
||||
'
|
||||
|
||||
test_expect_success 'log.decorate config parsing' '
|
||||
git log --oneline --decorate=full >expect.full &&
|
||||
git log --oneline --decorate=short >expect.short &&
|
||||
|
Loading…
Reference in New Issue
Block a user