Re: [DOC BUG] branch.autosetupmerge defaults to true, not false

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 11, 2008, 09:13 UTC
Message-ID: <7vejbjam9g.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <87bq6nc22l.fsf@Astalo.kon.iki.fi>

Kalle Olavi Niemitalo <kon@iki.fi> writes:

Show 18 quoted lines

> In Git v1.5.4.1, Documentation/config.txt describes:
>
>> branch.autosetupmerge::
>>         Tells `git-branch` and `git-checkout` to setup new branches
>>         so that linkgit: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.
>
> However, in builtin-branch.c:
>
>> static int branch_track = 1;
> ...
>>         if (!strcmp(var, "branch.autosetupmerge"))
>>                         branch_track = git_config_bool(var, value);
>
> So if the option is not listed in .git/config, then it actually
> defaults to true.  A demonstration with a bit older version:

Correct. 34a3e69 (git-branch: default to --track) did it without updating the documentation.