remote.c: introduce branch_get_upstream helper

All of the information needed to find the @{upstream} of a
branch is included in the branch struct, but callers have to
navigate a series of possible-NULL values to get there.
Let's wrap that logic up in an easy-to-read helper.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index 1d150378e91cd47c4cd555bfc858ec0b7ea9d604..bd1fa0b43ae90a75f75af860673cd96415ce80c5 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -123,14 +123,12 @@ static int branch_merged(int kind, const char *name,
 
        if (kind == REF_LOCAL_BRANCH) {
                struct branch *branch = branch_get(name);
 
        if (kind == REF_LOCAL_BRANCH) {
                struct branch *branch = branch_get(name);

+               const char *upstream = branch_get_upstream(branch);

                unsigned char sha1[20];
 
                unsigned char sha1[20];
 

-               if (branch &&
-                   branch->merge &&
-                   branch->merge[0] &&
-                   branch->merge[0]->dst &&
+               if (upstream &&

                    (reference_name = reference_name_to_free =
                    (reference_name = reference_name_to_free =

-                    resolve_refdup(branch->merge[0]->dst, RESOLVE_REF_READING,
+                    resolve_refdup(upstream, RESOLVE_REF_READING,

                                    sha1, NULL)) != NULL)
                        reference_rev = lookup_commit_reference(sha1);
        }
                                    sha1, NULL)) != NULL)
                        reference_rev = lookup_commit_reference(sha1);
        }

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 83f9cf91633a514e9301762fe774ee91be092848..dc2a201a451fd3d276aa5030ef55789129f85bb3 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -664,10 +664,9 @@ static void populate_value(struct refinfo *ref)
                                continue;
                        branch = branch_get(ref->refname + 11);
 
                                continue;
                        branch = branch_get(ref->refname + 11);
 

-                       if (!branch || !branch->merge || !branch->merge[0] ||
-                           !branch->merge[0]->dst)
+                       refname = branch_get_upstream(branch);
+                       if (!refname)

                                continue;
                                continue;

-                       refname = branch->merge[0]->dst;

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

diff --git a/builtin/log.c b/builtin/log.c
index dd8f3fcfc451780b244f6e6fd9e77298f484ad1a..fb61c08ee5ee1fa55c73403baddc7117e8a918b9 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1632,16 +1632,13 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
                break;
        default:
                current_branch = branch_get(NULL);
                break;
        default:
                current_branch = branch_get(NULL);

-               if (!current_branch || !current_branch->merge
-                                       || !current_branch->merge[0]
-                                       || !current_branch->merge[0]->dst) {
+               upstream = branch_get_upstream(current_branch);
+               if (!upstream) {

                        fprintf(stderr, _("Could not find a tracked"
                                        " remote branch, please"
                                        " specify <upstream> manually.\n"));
                        usage_with_options(cherry_usage, options);
                }
                        fprintf(stderr, _("Could not find a tracked"
                                        " remote branch, please"
                                        " specify <upstream> manually.\n"));
                        usage_with_options(cherry_usage, options);
                }

-
-               upstream = current_branch->merge[0]->dst;

        }
 
        init_revisions(&revs, prefix);
        }
 
        init_revisions(&revs, prefix);

diff --git a/remote.c b/remote.c
index e6b29b34b63d59c6319a013601bd9e2bb93927a0..dca3442abacfdc45561df0483f031e7ee7c06259 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1705,6 +1705,13 @@ int branch_merge_matches(struct branch *branch,
        return refname_match(branch->merge[i]->src, refname);
 }
 
        return refname_match(branch->merge[i]->src, refname);
 }
 

+const char *branch_get_upstream(struct branch *branch)
+{
+       if (!branch || !branch->merge || !branch->merge[0])
+               return NULL;
+       return branch->merge[0]->dst;
+}
+

 static int ignore_symref_update(const char *refname)
 {
        unsigned char sha1[20];
 static int ignore_symref_update(const char *refname)
 {
        unsigned char sha1[20];


@@ -1914,12 +1921,11 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
        int rev_argc;
 
        /* Cannot stat unless we are marked to build on top of somebody else. */
        int rev_argc;
 
        /* Cannot stat unless we are marked to build on top of somebody else. */

-       if (!branch ||
-           !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
+       base = branch_get_upstream(branch);
+       if (!base)

                return 0;
 
        /* Cannot stat if what we used to build on no longer exists */
                return 0;
 
        /* Cannot stat if what we used to build on no longer exists */

-       base = branch->merge[0]->dst;

        if (read_ref(base, sha1))
                return -1;
        theirs = lookup_commit_reference(sha1);
        if (read_ref(base, sha1))
                return -1;
        theirs = lookup_commit_reference(sha1);

diff --git a/remote.h b/remote.h
index 30a11dac103d778577760ac0f62f0d9c8a240d98..d96895282e17bd6320118c6d86ebd3efba10bf34 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -218,6 +218,13 @@ const char *pushremote_for_branch(struct branch *branch, int *explicit);
 int branch_has_merge_config(struct branch *branch);
 int branch_merge_matches(struct branch *, int n, const char *);
 
 int branch_has_merge_config(struct branch *branch);
 int branch_merge_matches(struct branch *, int n, const char *);
 

+/**
+ * Return the fully-qualified refname of the tracking branch for `branch`.
+ * I.e., what "branch@{upstream}" would give you. Returns NULL if no
+ * upstream is defined.
+ */
+const char *branch_get_upstream(struct branch *branch);
+

 /* Flags to match_refs. */
 enum match_refs_flags {
        MATCH_REFS_NONE         = 0,
 /* Flags to match_refs. */
 enum match_refs_flags {
        MATCH_REFS_NONE         = 0,