From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Linus Nilsson <Linus.Nilsson@trimma.se>
Subject: Re: [PATCH v2 15/15] merge-recursive: switch directory rename detection default
Date: Sat, 30 Mar 2019 10:12:39 +0100 [thread overview]
Message-ID: <87imw0afp4.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20190330003336.21940-16-newren@gmail.com>
On Sat, Mar 30 2019, Elijah Newren wrote:
I may have more, just quickly skimming this for the first time...
> merge.renames::
> - Whether and how Git detects renames. If set to "false",
> - rename detection is disabled. If set to "true", basic rename
> - detection is enabled. Defaults to the value of diff.renames.
> + Whether Git detects renames. If set to "false", rename detection
> + is disabled. If set to "true", basic rename detection is enabled.
> + Defaults to the value of diff.renames.
> [...]
> + if (!git_config_get_string("merge.directoryrenames", &value)) {
> + if (!strcasecmp(value, "true"))
> + opt->detect_directory_renames = 2;
> + else if (!strcasecmp(value, "false"))
> + opt->detect_directory_renames = 0;
> + else if (!strcasecmp(value, "conflict"))
> + opt->detect_directory_renames = 1;
> + else {
> + error(_("Invalid value for merge.directoryRenames: %s"),
> + value);
> + opt->detect_directory_renames = 1;
> + }
> + free(value);
> + }
Instead of making your own true/false parser you can use
git_parse_maybe_bool(). See what we do for merge.ff:
builtin/merge.c-617- else if (!strcmp(k, "merge.ff")) {
builtin/merge.c:618: int boolval = git_parse_maybe_bool(v);
builtin/merge.c-619- if (0 <= boolval) {
builtin/merge.c-620- fast_forward = boolval ? FF_ALLOW : FF_NO;
builtin/merge.c-621- } else if (v && !strcmp(v, "only")) {
builtin/merge.c-622- fast_forward = FF_ONLY;
builtin/merge.c-623- } /* do not barf on values from future versions of git */
builtin/merge.c-624- return 0;
Small nit, but allows us to document "this config takse bool or ..."
without having different verions of "bool" in various places.
Also, I don't care personally, but this also violates the "if one thing
requires braces put it on all the if/else arms" in CodingGuidelines.
next prev parent reply other threads:[~2019-03-30 9:12 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 12:47 [BUG] All files in folder are moved when cherry-picking commit that moves fewer files Linus Nilsson
2019-02-27 14:30 ` Phillip Wood
2019-02-27 16:02 ` Elijah Newren
2019-02-27 16:40 ` Jeff King
2019-02-27 17:31 ` Elijah Newren
2019-02-28 8:16 ` Linus Nilsson
2019-03-01 2:52 ` Junio C Hamano
2019-03-02 23:48 ` Elijah Newren
2019-03-03 1:33 ` Junio C Hamano
2019-03-06 0:27 ` Elijah Newren
2019-03-06 4:43 ` Junio C Hamano
2019-03-07 4:14 ` Elijah Newren
2019-03-07 5:45 ` Junio C Hamano
2019-03-07 5:45 ` Junio C Hamano
2019-03-30 0:33 ` [PATCH v2 00/15] Switch directory rename detection default Elijah Newren
2019-03-30 0:33 ` [PATCH v2 01/15] Use 'unsigned short' for mode, like diff_filespec does Elijah Newren
2019-03-30 0:33 ` [PATCH v2 02/15] merge-recursive: rename merge_options argument from 'o' to 'opt' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 03/15] merge-recursive: rename diff_filespec 'one' to 'o' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 04/15] merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 05/15] merge-recursive: use 'ci' for rename_conflict_info variable name Elijah Newren
2019-03-30 0:33 ` [PATCH v2 06/15] merge-recursive: move some struct declarations together Elijah Newren
2019-03-30 0:33 ` [PATCH v2 07/15] merge-recursive: shrink rename_conflict_info Elijah Newren
2019-03-30 0:33 ` [PATCH v2 08/15] merge-recursive: remove ren[12]_other fields from rename_conflict_info Elijah Newren
2019-03-30 0:33 ` [PATCH v2 09/15] merge-recursive: track branch where rename occurred in rename struct Elijah Newren
2019-03-30 0:33 ` [PATCH v2 10/15] merge-recursive: cleanup handle_rename_* function signatures Elijah Newren
2019-03-30 0:33 ` [PATCH v2 11/15] merge-recursive: switch from (oid,mode) pairs to a diff_filespec Elijah Newren
2019-03-30 0:33 ` [PATCH v2 12/15] t6043: fix copied test description to match its purpose Elijah Newren
2019-03-30 0:33 ` [PATCH v2 13/15] merge-recursive: track information associated with directory renames Elijah Newren
2019-03-30 0:33 ` [PATCH v2 14/15] merge-recursive: give callers of handle_content_merge() access to contents Elijah Newren
2019-03-30 0:33 ` [PATCH v2 15/15] merge-recursive: switch directory rename detection default Elijah Newren
2019-03-30 9:12 ` Ævar Arnfjörð Bjarmason [this message]
2019-04-01 15:41 ` Elijah Newren
2019-04-05 15:00 ` [PATCH v3 00/15] Switch " Elijah Newren
2019-04-05 15:00 ` [PATCH v3 01/15] Use 'unsigned short' for mode, like diff_filespec does Elijah Newren
2019-04-05 15:00 ` [PATCH v3 02/15] merge-recursive: rename merge_options argument from 'o' to 'opt' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 03/15] merge-recursive: rename diff_filespec 'one' to 'o' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 04/15] merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 05/15] merge-recursive: use 'ci' for rename_conflict_info variable name Elijah Newren
2019-04-05 15:00 ` [PATCH v3 06/15] merge-recursive: move some struct declarations together Elijah Newren
2019-04-05 15:00 ` [PATCH v3 07/15] merge-recursive: shrink rename_conflict_info Elijah Newren
2019-04-05 15:00 ` [PATCH v3 08/15] merge-recursive: remove ren[12]_other fields from rename_conflict_info Elijah Newren
2019-04-05 15:00 ` [PATCH v3 09/15] merge-recursive: track branch where rename occurred in rename struct Elijah Newren
2019-04-05 15:00 ` [PATCH v3 10/15] merge-recursive: cleanup handle_rename_* function signatures Elijah Newren
2019-04-05 15:00 ` [PATCH v3 11/15] merge-recursive: switch from (oid,mode) pairs to a diff_filespec Elijah Newren
2019-04-05 15:00 ` [PATCH v3 12/15] t6043: fix copied test description to match its purpose Elijah Newren
2019-04-05 15:00 ` [PATCH v3 13/15] merge-recursive: track information associated with directory renames Elijah Newren
2019-04-05 15:00 ` [PATCH v3 14/15] merge-recursive: give callers of handle_content_merge() access to contents Elijah Newren
2019-04-05 15:00 ` [PATCH v3 15/15] merge-recursive: switch directory rename detection default Elijah Newren
2019-04-05 16:32 ` [PATCH v3 00/15] Switch " Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87imw0afp4.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Linus.Nilsson@trimma.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).