This patch cleans up some complicated code, and replaces it with a
cleaner version. This also enables us to fix two cases:
The earlier "fix" to setup tracking only when the original ref started
with "refs/remotes" is wrong. You are absolutely allowed to use a
separate layout for your tracking branches. The correct fix, of course,
is to set up tracking information only when there is a matching
remote.<nick>.fetch line containing a colon.
Another corner case was not handled properly. If two remotes write to
the original ref, just warn the user and do not set up tracking.
Also, the "branch name too long" condition had an off-by-one. Not that it
matters in real life.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
On Sun, 8 Jul 2007, Junio C Hamano wrote:
> Paolo Bonzini <bonzini@xxxxxxx> writes:
>
> >> Having prepared the patch below, I do not think if the
> >> original patch even wanted to have 'all' semantics. The
> >> surrounding text only talks about "off a remote branch" and I
> >> strongly suspect that nobody wanted to do this for a local
> >> branch case at all.
> >
> > If I remember correctly, the problem was that you are not sure
> > that remote branches are in refs/remotes.
>
> Yes, the user can use traditional layout (e.g. refs/heads/origin
> is used as a remote tracking branch).
>
> So the check with refs/remotes/ is not technically correct, but
> it should probably look-up the configuration to check the
> tracking, if we really want to be strict about it.
Okay, so here is the correct fix. In the process, I rewrote large
parts of it. I really did not like the asnprintf() parts of the
original part, and I am not comfortable with it anyway, so that is
replaced, too.
BTW if someone wonders why the wildcards look so strange in the
comment: after the second compilation I got sick of the "warning:
/* contained within comment", and wanted to spare everybody.
Ah yes, I tried to prepare this patch with "format-patch -B", but
it seems to be too much in love with the few lines that match.
builtin-branch.c | 196 ++++++++++++++++++++++++-----------------------------
t/t3200-branch.sh | 21 +++---
2 files changed, 99 insertions(+), 118 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 49195a1..d290a7a 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -22,7 +22,7 @@ static const char builtin_branch_usage[] =
static const char *head;
static unsigned char head_sha1[20];
-static int branch_track = 1; /* 0 = none, 1 = remotes, 2 = all */
+static int branch_track = 1;
static int branch_use_color;
static char branch_colors[][COLOR_MAXLEN] = {
@@ -66,12 +66,8 @@ static int git_branch_config(const char *var, const char *value)
color_parse(value, var, branch_colors[slot]);
return 0;
}
- if (!strcmp(var, "branch.autosetupmerge")) {
- if (!strcmp(value, "all"))
- branch_track = 2;
- else
+ if (!strcmp(var, "branch.autosetupmerge"))
branch_track = git_config_bool(var, value);
- }
return git_default_config(var, value);
}
@@ -349,125 +345,111 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev,
free_ref_list(&ref_list);
}
-static char *config_repo;
-static char *config_remote;
-static const char *start_ref;
+static struct {
+ const char *ref;
+ int ref_len;
+ char *remote;
+ char *merge;
+ int matches;
+} tracking;
-static int get_remote_branch_name(const char *value)
+static int tracking_config(const char *key, const char *value)
{
const char *colon;
- const char *end;
-
- if (*value == '+')
- value++;
+ int key_len, value_len, match_len;
+ char *merge = NULL;
- colon = strchr(value, ':');
- if (!colon)
+ /* we want: remote.<nick>.fetch = <merge>:<ref> */
+ if (prefixcmp(key, "remote.") || (key_len = strlen(key)) < 6 ||
+ strcmp(key + key_len - 6, ".fetch") ||
+ !(colon = strchr(value, ':')))
return 0;
- end = value + strlen(value);
+ if (*value == '+')
+ value++;
/*
- * Try an exact match first. I.e. handle the case where the
- * value is "$anything:refs/foo/bar/baz" and start_ref is exactly
- * "refs/foo/bar/baz". Then the name at the remote is $anything.
+ * A remote.<name>.fetch value can have two forms:
+ *
+ * - exact:
+ *
+ * refs/heads/gnu:refs/heads/my-upstream
+ *
+ * - wildcard:
+ *
+ * refs/heads/ *:refs/remotes/gnu/ *
+ *
+ * try exact match first:
*/
- if (!strcmp(colon + 1, start_ref)) {
+ if (!strcmp(colon + 1, tracking.ref))
/* Truncate the value before the colon. */
- nfasprintf(&config_repo, "%.*s", colon - value, value);
- return 1;
+ merge = xstrndup(value, colon - value);
+
+ /* wildcard; match_len is the length of the matching prefix */
+ else if ((value_len = strlen(value)) > tracking.ref_len &&
+ !strcmp(value + value_len - 2, "/*") &&
+ (match_len = value_len - (colon - value) - 2) > 0 &&
+ match_len < tracking.ref_len &&
+ !memcmp(colon + 1, tracking.ref, match_len)) {
+ int postfix_len = tracking.ref_len - match_len;
+ int replace_len = colon - 1 - value;
+ merge = xmalloc(replace_len + postfix_len);
+ memcpy(merge, value, replace_len);
+ memcpy(merge + replace_len,
+ tracking.ref + match_len, postfix_len);
}
- /*
- * Is this a wildcard match?
- */
- if ((end - 2 <= value) || end[-2] != '/' || end[-1] != '*' ||
- (colon - 2 <= value) || colon[-2] != '/' || colon[-1] != '*')
- return 0;
-
- /*
- * Value is "refs/foo/bar/<asterisk>:refs/baz/boa/<asterisk>"
- * and start_ref begins with "refs/baz/boa/"; the name at the
- * remote is refs/foo/bar/ with the remaining part of the
- * start_ref. The length of the prefix on the RHS is (end -
- * colon - 2), including the slash immediately before the
- * asterisk.
- */
- if ((strlen(start_ref) < end - colon - 2) ||
- memcmp(start_ref, colon + 1, end - colon - 2))
- return 0; /* does not match prefix */
-
- /* Replace the asterisk with the remote branch name. */
- nfasprintf(&config_repo, "%.*s%s",
- (colon - 1) - value, value,
- start_ref + (end - colon - 2));
- return 1;
-}
-
-static int get_remote_config(const char *key, const char *value)
-{
- const char *var;
- if (prefixcmp(key, "remote."))
+ if (!merge)
return 0;
- var = strrchr(key, '.');
- if (var == key + 6 || strcmp(var, ".fetch"))
- return 0;
- /*
- * Ok, we are looking at key == "remote.$foo.fetch";
- */
- if (get_remote_branch_name(value))
- nfasprintf(&config_remote, "%.*s", var - (key + 7), key + 7);
+ tracking.matches++;
+ if (tracking.merge)
+ free(merge);
+ else {
+ tracking.merge = merge;
+ tracking.remote = xstrndup(key + 7, key_len - 7 - 6);
+ }
return 0;
}
-static void set_branch_merge(const char *name, const char *config_remote,
- const char *config_repo)
-{
- char key[1024];
- if (sizeof(key) <=
- snprintf(key, sizeof(key), "branch.%s.remote", name))
- die("what a long branch name you have!");
- git_config_set(key, config_remote);
- /*
- * We do not have to check if we have enough space for
- * the 'merge' key, since it's shorter than the
- * previous 'remote' key, which we already checked.
- */
- snprintf(key, sizeof(key), "branch.%s.merge", name);
- git_config_set(key, config_repo);
-}
-
-static void set_branch_defaults(const char *name, const char *real_ref)
+/*
+ * This is called when new_ref is branched off of orig_ref, and tries
+ * to infer the settings for branch.<new_ref>.{remote,merge} from the
+ * config.
+ */
+static void setup_tracking(const char *new_ref, const char *orig_ref)
{
- /*
- * name is the name of new branch under refs/heads;
- * real_ref is typically refs/remotes/$foo/$bar, where
- * $foo is the remote name (there typically are no slashes)
- * and $bar is the branch name we map from the remote
- * (it could have slashes).
- */
- start_ref = real_ref;
- git_config(get_remote_config);
- if (!config_repo && !config_remote &&
- !prefixcmp(real_ref, "refs/heads/")) {
- set_branch_merge(name, ".", real_ref);
- printf("Branch %s set up to track local branch %s.\n",
- name, real_ref);
- }
-
- if (config_repo && config_remote) {
- set_branch_merge(name, config_remote, config_repo);
- printf("Branch %s set up to track remote branch %s.\n",
- name, real_ref);
+ tracking.ref = orig_ref;
+ tracking.ref_len = strlen(tracking.ref);
+ git_config(tracking_config);
+
+ if (tracking.matches > 1)
+ error("Not tracking: ambiguous information for ref %s",
+ orig_ref);
+ else if (tracking.matches == 1) {
+ char key[1024];
+ int n = snprintf(key, sizeof(key), "branch.%s.remote",
+ new_ref);
+ if (n < sizeof(key) - 1) {
+ git_config_set(key, tracking.remote ?
+ tracking.remote : ".");
+
+ snprintf(key, sizeof(key), "branch.%s.merge", new_ref);
+ git_config_set(key, tracking.merge);
+
+ printf("Branch %s set up to track remote branch %s.\n",
+ new_ref, orig_ref);
+ } else
+ error("Tracking not set up: name too long: %s",
+ new_ref);
}
- if (config_repo)
- free(config_repo);
- if (config_remote)
- free(config_remote);
+ if (tracking.remote)
+ free(tracking.remote);
+ if (tracking.merge)
+ free(tracking.merge);
}
static void create_branch(const char *name, const char *start_name,
@@ -529,10 +511,8 @@ static void create_branch(const char *name, const char *start_name,
/* When branching off a remote branch, set up so that git-pull
automatically merges from there. So far, this is only done for
remotes registered via .git/config. */
- if (real_ref && (track == 2 ||
- (track == 1 &&
- !prefixcmp(real_ref, "refs/remotes/"))))
- set_branch_defaults(name, real_ref);
+ if (real_ref && track)
+ setup_tracking(name, real_ref);
if (write_ref_sha1(lock, sha1, msg) < 0)
die("Failed to write ref: %s.", strerror(errno));
@@ -604,7 +584,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
break;
}
if (!strcmp(arg, "--track")) {
- track = 2;
+ track = 1;
continue;
}
if (!strcmp(arg, "--no-track")) {
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index a19e961..ef1eeb7 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -148,13 +148,14 @@ test_expect_success 'test tracking setup via config' \
test $(git config branch.my3.remote) = local &&
test $(git config branch.my3.merge) = refs/heads/master'
-test_expect_success 'autosetupmerge = all' '
+test_expect_success 'avoid ambiguous track' '
git config branch.autosetupmerge true &&
+ git config remote.ambi1.url = lalala &&
+ git config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master &&
+ git config remote.ambi2.url = lilili &&
+ git config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master &&
git branch all1 master &&
- test -z "$(git config branch.all1.merge)" &&
- git config branch.autosetupmerge all &&
- git branch all2 master &&
- test $(git config branch.all2.merge) = refs/heads/master
+ test -z "$(git config branch.all1.merge)"
'
test_expect_success 'test overriding tracking setup via --no-track' \
@@ -167,10 +168,10 @@ test_expect_success 'test overriding tracking setup via --no-track' \
! test "$(git config branch.my2.remote)" = local &&
! test "$(git config branch.my2.merge)" = refs/heads/master'
-test_expect_success 'test local tracking setup' \
+test_expect_success 'no tracking without .fetch entries' \
'git branch --track my6 s &&
- test $(git config branch.my6.remote) = . &&
- test $(git config branch.my6.merge) = refs/heads/s'
+ test -z "$(git config branch.my6.remote)" &&
+ test -z "$(git config branch.my6.merge)"'
test_expect_success 'test tracking setup via --track but deeper' \
'git config remote.local.url . &&
@@ -182,8 +183,8 @@ test_expect_success 'test tracking setup via --track but deeper' \
test_expect_success 'test deleting branch deletes branch config' \
'git branch -d my7 &&
- test "$(git config branch.my7.remote)" = "" &&
- test "$(git config branch.my7.merge)" = ""'
+ test -z "$(git config branch.my7.remote)" &&
+ test -z "$(git config branch.my7.merge)"'
test_expect_success 'test deleting branch without config' \
'git branch my7 s &&
--
1.5.3.rc0.2769.gd9be2
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
