for-each-ref: accept "%(push)" format

Just as we have "%(upstream)" to report the "@{upstream}"
for each ref, this patch adds "%(push)" to match "@{push}".
It supports the same tracking format modifiers as upstream
(because you may want to know, for example, which branches
have commits to push).

Signed-off-by: Jeff King <peff@peff.net>
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 42408752d0848f0854308407ff7606b40f1e6eed..7f8d9a5b5f358baa50bdfe205f555ea904f9f629 100644 (file)
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -97,6 +97,12 @@ upstream::
        or "=" (in sync).  Has no effect if the ref does not have
        tracking information associated with it.
 
        or "=" (in sync).  Has no effect if the ref does not have
        tracking information associated with it.
 

+push::
+       The name of a local ref which represents the `@{push}` location
+       for the displayed ref. Respects `:short`, `:track`, and
+       `:trackshort` options as `upstream` does. Produces an empty
+       string if no `@{push}` ref is configured.
+

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

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 2bd19caa9cbe62d197b745d24670859d0a16ac20..05dd23d2a35b30eab9d7ef3c01e00c3e99cf5577 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -74,6 +74,7 @@ static struct {
        { "contents:body" },
        { "contents:signature" },
        { "upstream" },
        { "contents:body" },
        { "contents:signature" },
        { "upstream" },

+       { "push" },

        { "symref" },
        { "flag" },
        { "HEAD" },
        { "symref" },
        { "flag" },
        { "HEAD" },


@@ -669,6 +670,16 @@ static void populate_value(struct refinfo *ref)
                        refname = branch_get_upstream(branch, NULL);
                        if (!refname)
                                continue;
                        refname = branch_get_upstream(branch, NULL);
                        if (!refname)
                                continue;

+               } else if (starts_with(name, "push")) {
+                       const char *branch_name;
+                       if (!skip_prefix(ref->refname, "refs/heads/",
+                                        &branch_name))
+                               continue;
+                       branch = branch_get(branch_name);
+
+                       refname = branch_get_push(branch, NULL);
+                       if (!refname)
+                               continue;

                } else if (starts_with(name, "color:")) {
                        char color[COLOR_MAXLEN] = "";
 
                } else if (starts_with(name, "color:")) {
                        char color[COLOR_MAXLEN] = "";
 


@@ -714,7 +725,8 @@ static void populate_value(struct refinfo *ref)
                                refname = shorten_unambiguous_ref(refname,
                                                      warn_ambiguous_refs);
                        else if (!strcmp(formatp, "track") &&
                                refname = shorten_unambiguous_ref(refname,
                                                      warn_ambiguous_refs);
                        else if (!strcmp(formatp, "track") &&

-                                starts_with(name, "upstream")) {
+                                (starts_with(name, "upstream") ||
+                                 starts_with(name, "push"))) {

                                char buf[40];
 
                                if (stat_tracking_info(branch, &num_ours,
                                char buf[40];
 
                                if (stat_tracking_info(branch, &num_ours,


@@ -736,7 +748,8 @@ static void populate_value(struct refinfo *ref)
                                }
                                continue;
                        } else if (!strcmp(formatp, "trackshort") &&
                                }
                                continue;
                        } else if (!strcmp(formatp, "trackshort") &&

-                                  starts_with(name, "upstream")) {
+                                  (starts_with(name, "upstream") ||
+                                   starts_with(name, "push"))) {

                                assert(branch);
 
                                if (stat_tracking_info(branch, &num_ours,
                                assert(branch);
 
                                if (stat_tracking_info(branch, &num_ours,

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index c66bf7981c5328356005963e15262c8d870ac61c..24fc2ba55da38232f07c58346c628b61822af44a 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -28,7 +28,10 @@ test_expect_success setup '
        git update-ref refs/remotes/origin/master master &&
        git remote add origin nowhere &&
        git config branch.master.remote origin &&
        git update-ref refs/remotes/origin/master master &&
        git remote add origin nowhere &&
        git config branch.master.remote origin &&

-       git config branch.master.merge refs/heads/master
+       git config branch.master.merge refs/heads/master &&
+       git remote add myfork elsewhere &&
+       git config remote.pushdefault myfork &&
+       git config push.default current

 '
 
 test_atom() {
 '
 
 test_atom() {


@@ -47,6 +50,7 @@ test_atom() {
 
 test_atom head refname refs/heads/master
 test_atom head upstream refs/remotes/origin/master
 
 test_atom head refname refs/heads/master
 test_atom head upstream refs/remotes/origin/master

+test_atom head push refs/remotes/myfork/master

 test_atom head objecttype commit
 test_atom head objectsize 171
 test_atom head objectname $(git rev-parse refs/heads/master)
 test_atom head objecttype commit
 test_atom head objectsize 171
 test_atom head objectname $(git rev-parse refs/heads/master)


@@ -83,6 +87,7 @@ 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 ''

+test_atom tag push ''

 test_atom tag objecttype tag
 test_atom tag objectsize 154
 test_atom tag objectname $(git rev-parse refs/tags/testtag)
 test_atom tag objecttype tag
 test_atom tag objectsize 154
 test_atom tag objectname $(git rev-parse refs/tags/testtag)


@@ -347,6 +352,12 @@ test_expect_success 'Check that :track[short] works when upstream is invalid' '
        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 

+test_expect_success '%(push) supports tracking specifiers, too' '
+       echo "[ahead 1]" >expected &&
+       git for-each-ref --format="%(push:track)" refs/heads >actual &&
+       test_cmp expected actual
+'
+

 cat >expected <<EOF
 $(git rev-parse --short HEAD)
 EOF
 cat >expected <<EOF
 $(git rev-parse --short HEAD)
 EOF