ref-filter: use correct branch for %(push:track)

In ref-filter.c, when processing the atom %(push:track), the
ahead/behind values are computed using `stat_tracking_info` which refers
to the upstream branch.

Fix that by introducing a new flag `for_push` in `stat_tracking_info`
in remote.c, which does the same thing but for the push branch.
Update the few callers of `stat_tracking_info` to handle this flag. This
ensure that whenever we use this function in the future, we are careful
to specify is this should apply to the upstream or the push branch.

This bug was not detected in t/t6300-for-each-ref.sh because in the test
for push:track, both the upstream and the push branches were behind by 1
from the local branch. Change the test so that the upstream branch is
behind by 1 while the push branch is ahead by 1. This allows us to test
that %(push:track) refers to the correct branch.

This changes the expected value of some following tests (by introducing
new references), so update them too.

Signed-off-by: Damien Robert <damien.olivier.robert+git@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 422a9c9ae3fd2cfd552ce48c5e68ce18919b1eb9..cadafec28345136d31bf5f690ad7e0dfabcb20fe 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1388,7 +1388,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
                *s = show_ref(&atom->u.remote_ref.refname, refname);
        else if (atom->u.remote_ref.option == RR_TRACK) {
                if (stat_tracking_info(branch, &num_ours, &num_theirs,
                *s = show_ref(&atom->u.remote_ref.refname, refname);
        else if (atom->u.remote_ref.option == RR_TRACK) {
                if (stat_tracking_info(branch, &num_ours, &num_theirs,

-                                      NULL, AHEAD_BEHIND_FULL) < 0) {
+                                      NULL, atom->u.remote_ref.push,
+                                      AHEAD_BEHIND_FULL) < 0) {

                        *s = xstrdup(msgs.gone);
                } else if (!num_ours && !num_theirs)
                        *s = xstrdup("");
                        *s = xstrdup(msgs.gone);
                } else if (!num_ours && !num_theirs)
                        *s = xstrdup("");


@@ -1406,7 +1407,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
                }
        } else if (atom->u.remote_ref.option == RR_TRACKSHORT) {
                if (stat_tracking_info(branch, &num_ours, &num_theirs,
                }
        } else if (atom->u.remote_ref.option == RR_TRACKSHORT) {
                if (stat_tracking_info(branch, &num_ours, &num_theirs,

-                                      NULL, AHEAD_BEHIND_FULL) < 0) {
+                                      NULL, atom->u.remote_ref.push,
+                                      AHEAD_BEHIND_FULL) < 0) {

                        *s = xstrdup("");
                        return;
                }
                        *s = xstrdup("");
                        return;
                }

diff --git a/remote.c b/remote.c
index 9cc3b07d214a63271849243c5f823b8f87ad631b..0761d1ab21f57ccdc46528d022a2d365e85b0b71 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1880,37 +1880,27 @@ int resolve_remote_symref(struct ref *ref, struct ref *list)
 }
 
 /*
 }
 
 /*

- * Lookup the upstream branch for the given branch and if present, optionally
- * compute the commit ahead/behind values for the pair.
+ * Compute the commit ahead/behind values for the pair branch_name, base.

  *
  * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
  * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
  * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
  * set to zero).
  *
  *
  * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
  * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
  * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
  * set to zero).
  *

- * The name of the upstream branch (or NULL if no upstream is defined) is
- * returned via *upstream_name, if it is not itself NULL.
- *
- * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
- * upstream defined, or ref does not exist).  Returns 0 if the commits are
- * identical.  Returns 1 if commits are different.
+ * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
+ * does not exist).  Returns 0 if the commits are identical.  Returns 1 if
+ * commits are different.

  */
  */

-int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
-                      const char **upstream_name, enum ahead_behind_flags abf)
+
+static int stat_branch_pair(const char *branch_name, const char *base,
+                            int *num_ours, int *num_theirs,
+                            enum ahead_behind_flags abf)

 {
        struct object_id oid;
        struct commit *ours, *theirs;
        struct rev_info revs;
 {
        struct object_id oid;
        struct commit *ours, *theirs;
        struct rev_info revs;

-       const char *base;

        struct argv_array argv = ARGV_ARRAY_INIT;
 
        struct argv_array argv = ARGV_ARRAY_INIT;
 

-       /* Cannot stat unless we are marked to build on top of somebody else. */
-       base = branch_get_upstream(branch, NULL);
-       if (upstream_name)
-               *upstream_name = base;
-       if (!base)
-               return -1;
-

        /* Cannot stat if what we used to build on no longer exists */
        if (read_ref(base, &oid))
                return -1;
        /* Cannot stat if what we used to build on no longer exists */
        if (read_ref(base, &oid))
                return -1;


@@ -1918,7 +1908,7 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
        if (!theirs)
                return -1;
 
        if (!theirs)
                return -1;
 

-       if (read_ref(branch->refname, &oid))
+       if (read_ref(branch_name, &oid))

                return -1;
        ours = lookup_commit_reference(the_repository, &oid);
        if (!ours)
                return -1;
        ours = lookup_commit_reference(the_repository, &oid);
        if (!ours)


@@ -1932,7 +1922,7 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
        if (abf == AHEAD_BEHIND_QUICK)
                return 1;
        if (abf != AHEAD_BEHIND_FULL)
        if (abf == AHEAD_BEHIND_QUICK)
                return 1;
        if (abf != AHEAD_BEHIND_FULL)

-               BUG("stat_tracking_info: invalid abf '%d'", abf);
+               BUG("stat_branch_pair: invalid abf '%d'", abf);

 
        /* Run "rev-list --left-right ours...theirs" internally... */
        argv_array_push(&argv, ""); /* ignored */
 
        /* Run "rev-list --left-right ours...theirs" internally... */
        argv_array_push(&argv, ""); /* ignored */


@@ -1966,6 +1956,42 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
        return 1;
 }
 
        return 1;
 }
 

+/*
+ * Lookup the tracking branch for the given branch and if present, optionally
+ * compute the commit ahead/behind values for the pair.
+ *
+ * If for_push is true, the tracking branch refers to the push branch,
+ * otherwise it refers to the upstream branch.
+ *
+ * The name of the tracking branch (or NULL if it is not defined) is
+ * returned via *tracking_name, if it is not itself NULL.
+ *
+ * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
+ * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
+ * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
+ * set to zero).
+ *
+ * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
+ * upstream defined, or ref does not exist).  Returns 0 if the commits are
+ * identical.  Returns 1 if commits are different.
+ */
+int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
+                      const char **tracking_name, int for_push,
+                      enum ahead_behind_flags abf)
+{
+       const char *base;
+
+       /* Cannot stat unless we are marked to build on top of somebody else. */
+       base = for_push ? branch_get_push(branch, NULL) :
+               branch_get_upstream(branch, NULL);
+       if (tracking_name)
+               *tracking_name = base;
+       if (!base)
+               return -1;
+
+       return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
+}
+

 /*
  * Return true when there is anything to report, otherwise false.
  */
 /*
  * Return true when there is anything to report, otherwise false.
  */


@@ -1977,7 +2003,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
        char *base;
        int upstream_is_gone = 0;
 
        char *base;
        int upstream_is_gone = 0;
 

-       sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
+       sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);

        if (sti < 0) {
                if (!full_base)
                        return 0;
        if (sti < 0) {
                if (!full_base)
                        return 0;

diff --git a/remote.h b/remote.h
index da53ad570b91dbd4a820ffc79541fb0a4915ff6b..0138b3fb989ec825bf370b6e1f3a459a6a7f1d5d 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -253,7 +253,8 @@ enum ahead_behind_flags {
 
 /* Reporting of tracking info */
 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
 
 /* Reporting of tracking info */
 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,

-                      const char **upstream_name, enum ahead_behind_flags abf);
+                      const char **upstream_name, int for_push,
+                      enum ahead_behind_flags abf);

 int format_tracking_info(struct branch *branch, struct strbuf *sb,
                         enum ahead_behind_flags abf);
 
 int format_tracking_info(struct branch *branch, struct strbuf *sb,
                         enum ahead_behind_flags abf);
 

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 0ffd63071392eba0cd960ddf50d45bc0b5f1d5ea..d9235217fcc72912574c80cea684aa17c8b736d2 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -392,8 +392,15 @@ test_atom head upstream:track '[ahead 1]'
 test_atom head upstream:trackshort '>'
 test_atom head upstream:track,nobracket 'ahead 1'
 test_atom head upstream:nobracket,track 'ahead 1'
 test_atom head upstream:trackshort '>'
 test_atom head upstream:track,nobracket 'ahead 1'
 test_atom head upstream:nobracket,track 'ahead 1'

-test_atom head push:track '[ahead 1]'
-test_atom head push:trackshort '>'
+
+test_expect_success 'setup for push:track[short]' '
+       test_commit third &&
+       git update-ref refs/remotes/myfork/master master &&
+       git reset master~1
+'
+
+test_atom head push:track '[behind 1]'
+test_atom head push:trackshort '<'

 
 test_expect_success 'Check that :track[short] cannot be used with other atoms' '
        test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
 
 test_expect_success 'Check that :track[short] cannot be used with other atoms' '
        test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&


@@ -420,8 +427,10 @@ test_expect_success 'Check for invalid refname format' '
 test_expect_success 'set up color tests' '
        cat >expected.color <<-EOF &&
        $(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
 test_expect_success 'set up color tests' '
        cat >expected.color <<-EOF &&
        $(git rev-parse --short refs/heads/master) <GREEN>master<RESET>

+       $(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET>

        $(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
        $(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
        $(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
        $(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>

+       $(git rev-parse --short refs/tags/third) <GREEN>third<RESET>

        $(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
        EOF
        sed "s/<[^>]*>//g" <expected.color >expected.bare &&
        $(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
        EOF
        sed "s/<[^>]*>//g" <expected.color >expected.bare &&

diff --git a/wt-status.c b/wt-status.c
index 1f564b12d259956fa71fb0dce78c6e4c3c006897..dcd9c005b9aab9391745c4f5b115f5ca1a9b47b9 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1840,7 +1840,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
 
        sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
 
        sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,

-                                s->ahead_behind_flags);
+                                0, s->ahead_behind_flags);

        if (sti < 0) {
                if (!base)
                        goto conclude;
        if (sti < 0) {
                if (!base)
                        goto conclude;


@@ -1979,7 +1979,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
                branch = branch_get(branch_name);
                base = NULL;
                ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
                branch = branch_get(branch_name);
                base = NULL;
                ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,

-                                            &base, s->ahead_behind_flags);
+                                            &base, 0, s->ahead_behind_flags);

                if (base) {
                        base = shorten_unambiguous_ref(base, 0);
                        fprintf(s->fp, "# branch.upstream %s%c", base, eol);
                if (base) {
                        base = shorten_unambiguous_ref(base, 0);
                        fprintf(s->fp, "# branch.upstream %s%c", base, eol);