{"thread":{"id":"36468","subject":"[PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive","startedAt":"2014-04-22T00:47:56Z","lastAt":"2014-04-22T19:37:30Z","messageCount":2,"participants":["Luis R. Rodriguez","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"239280","messageId":"1398127676-12311-1-git-send-email-mcgrof@do-not-panic.com","threadId":"36468","inReplyTo":null,"subject":"[PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive","fromName":"Luis R. Rodriguez","fromEmail":"mcgrof@do-not-panic.com","sentAt":"2014-04-22T00:47:56Z","receivedAt":"2014-04-22T00:47:56Z","isPatch":true,"sender":{"key":"mcgrof@do-not-panic.com","avatar":null},"body":"From: \"Luis R. Rodriguez\" <mcgrof@suse.com>\n\nThis saves us a few branches when RUN_SETUP is set up.\n\nSigned-off-by: Luis R. Rodriguez <mcgrof@suse.com>\n---\n git.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git.c b/git.c\nindex 9efd1a3..7780572 100644\n--- a/git.c\n+++ b/git.c\n@@ -290,7 +290,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)\n \tif (!help) {\n \t\tif (p->option & RUN_SETUP)\n \t\t\tprefix = setup_git_directory();\n-\t\tif (p->option & RUN_SETUP_GENTLY) {\n+\t\telse if (p->option & RUN_SETUP_GENTLY) {\n \t\t\tint nongit_ok;\n \t\t\tprefix = setup_git_directory_gently(&nongit_ok);\n \t\t}\n-- \n1.9.0\n"},{"id":"239373","messageId":"xmqqvbu140lh.fsf@gitster.dls.corp.google.com","threadId":"36468","inReplyTo":"1398127676-12311-1-git-send-email-mcgrof@do-not-panic.com","subject":"Re: [PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-04-22T19:37:30Z","receivedAt":"2014-04-22T19:37:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Luis R. Rodriguez\" <mcgrof@do-not-panic.com> writes:\n\n> From: \"Luis R. Rodriguez\" <mcgrof@suse.com>\n>\n> This saves us a few branches when RUN_SETUP is set up.\n>\n> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>\n> ---\n\nMakes sense, especially because there is no sane reason to set both\nbits on.\n\n>  git.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git.c b/git.c\n> index 9efd1a3..7780572 100644\n> --- a/git.c\n> +++ b/git.c\n> @@ -290,7 +290,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)\n>  \tif (!help) {\n>  \t\tif (p->option & RUN_SETUP)\n>  \t\t\tprefix = setup_git_directory();\n> -\t\tif (p->option & RUN_SETUP_GENTLY) {\n> +\t\telse if (p->option & RUN_SETUP_GENTLY) {\n>  \t\t\tint nongit_ok;\n>  \t\t\tprefix = setup_git_directory_gently(&nongit_ok);\n>  \t\t}\n"}]}