Re: [PATCH] branch.autosetupmerge: allow boolean values, or "all"
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:20
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] branch.autosetupmerge: allow boolean values, or "all" · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] branch.autosetupmerge: allow boolean values, or "all" · Junio C Hamano <hidden>
Johannes Schindelin [off-list ref] writes:
> Eh? I did not want this to get applied for my local branches. That is certainly unexpected and unwelcomed. Alas, I think it is one of the consequences of rarely executed (and thus, tested) code. ... +test_expect_success 'autosetupmerge = all' ' + git config branch.autosetupmerge true && + 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 +'
Thanks. 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.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4b67f0a..aeece84 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -309,7 +309,10 @@ branch.autosetupmerge:: so that gitlink:git-pull[1] will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to false. + and `--no-track` options. This option can have values + 'false' (never touch the configuration), 'all' (do this + for all branches), or 'true' (do this only when + branching from a remote tracking branch), and defaults to 'true'. branch.<name>.remote:: When in branch <name>, it tells `git fetch` which remote to fetch.
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 818b720..8292952 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt@@ -52,8 +52,9 @@ OPTIONS set up configuration so that git-pull will automatically retrieve data from the remote branch. Set the branch.autosetupmerge configuration variable to true if you - want git-checkout and git-branch to always behave as if - '--track' were given. + want git-checkout and git-branch to behave as if + '--track' were given when you branch from a remote + tracking branch. --no-track:: When -b is given and a branch is created off a remote branch,