for-each-ref: introduce %(HEAD) asterisk marker

'git branch' shows which branch you are currently on with an '*', but
'git for-each-ref' misses this feature.  So, extend its format with
%(HEAD) for the same effect.

Now you can use the following format in for-each-ref:

%(HEAD) %(refname:short)

to display an asterisk next to the current ref.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index f2e08d11c19cf127c5f7d484b0c3d66fc475d547..8f87c9a1ef733b98987fad377850fbcf2272ae95 100644 (file)
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -93,6 +93,10 @@ upstream::
        from the displayed ref. Respects `:short` in the same way as
        `refname` above.
 
        from the displayed ref. Respects `:short` in the same way as
        `refname` above.
 

+HEAD::
+       '*' if HEAD matches current ref (the checked out branch), ' '
+       otherwise.
+

 In addition to the above, for commit and tag objects, the header
 field names (`tree`, `parent`, `object`, `type`, and `tag`) can
 be used to specify the value in the header field.
 In addition to the above, for commit and tag objects, the header
 field names (`tree`, `parent`, `object`, `type`, and `tag`) can
 be used to specify the value in the header field.

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 1d4083c2ddef07c6488d36720e6a0c48b04c6585..5f1842f48f89007eae821c422caeadcd4ef8a20c 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -75,6 +75,7 @@ static struct {
        { "upstream" },
        { "symref" },
        { "flag" },
        { "upstream" },
        { "symref" },
        { "flag" },

+       { "HEAD" },

 };
 
 /*
 };
 
 /*


@@ -675,8 +676,16 @@ static void populate_value(struct refinfo *ref)
                                v->s = xstrdup(buf + 1);
                        }
                        continue;
                                v->s = xstrdup(buf + 1);
                        }
                        continue;

-               }
-               else
+               } else if (!strcmp(name, "HEAD")) {
+                       const char *head;
+                       unsigned char sha1[20];
+                       head = resolve_ref_unsafe("HEAD", sha1, 1, NULL);
+                       if (!strcmp(ref->refname, head))
+                               v->s = "*";
+                       else
+                               v->s = " ";
+                       continue;
+               } else

                        continue;
 
                formatp = strchr(name, ':');
                        continue;
 
                formatp = strchr(name, ':');

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 675c2a2cfe2b20050ad68e58e1befd414cdd4866..1d998f8550719afaff0c817ff61eff1a588ec222 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -77,6 +77,7 @@ test_atom head contents:body ''
 test_atom head contents:signature ''
 test_atom head contents 'Initial
 '
 test_atom head contents:signature ''
 test_atom head contents 'Initial
 '

+test_atom head HEAD '*'

 
 test_atom tag refname refs/tags/testtag
 test_atom tag upstream ''
 
 test_atom tag refname refs/tags/testtag
 test_atom tag upstream ''


@@ -110,6 +111,7 @@ test_atom tag contents:body ''
 test_atom tag contents:signature ''
 test_atom tag contents 'Tagging at 1151939927
 '
 test_atom tag contents:signature ''
 test_atom tag contents 'Tagging at 1151939927
 '

+test_atom tag HEAD ' '

 
 test_expect_success 'Check invalid atoms names are errors' '
        test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
 
 test_expect_success 'Check invalid atoms names are errors' '
        test_must_fail git for-each-ref --format="%(INVALID)" refs/heads