{"thread":{"id":"17834","subject":"[PATCH] Minor grammar fix in the 'Not a git repository' message","startedAt":"2009-02-16T22:58:10Z","lastAt":"2009-02-17T09:29:27Z","messageCount":8,"participants":["Johannes Schindelin","Wincent Colaiuta","Junio C Hamano","Nicolas Sebrecht","Boyd Stephen Smith Jr.","Lars Noschinski","Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"105024","messageId":"8787c5894e7831bbd1ace3b2fd6649f1362d4b78.1234825069u.git.johannes.schindelin@gmx.de","threadId":"17834","inReplyTo":"cover.1234825069u.git.johannes.schindelin@gmx.de","subject":"[PATCH] Minor grammar fix in the 'Not a git repository' message","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-02-16T22:58:10Z","receivedAt":"2009-02-16T22:58:10Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"It might cause less head-scratching to say 'nor any of the parent\ndirectories' than 'or ...' after saying that this is not a git\nrepository.\n\nSigned-off-by: Johannes Schindelin \n---\n setup.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex 6c2deda..05bd462 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -386,7 +386,7 @@ const char *setup_git_directory_gently(int *nongit_ok)\n \t\t\t\t*nongit_ok = 1;\n \t\t\t\treturn NULL;\n \t\t\t}\n-\t\t\tdie(\"Not a git repository (or any of the parent directories): %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n+\t\t\tdie(\"Not a git repository (nor any of the parent directories): %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n \t\t}\n \t\tif (chdir(\"..\"))\n \t\t\tdie(\"Cannot change to %s/..: %s\", cwd, strerror(errno));\n-- \n1.6.2.rc0.397.g19ae22\n"},{"id":"105028","messageId":"E8469C6E-A238-4DD0-B287-09E8ABCE4801@wincent.com","threadId":"17834","inReplyTo":"8787c5894e7831bbd1ace3b2fd6649f1362d4b78.1234825069u.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] Minor grammar fix in the 'Not a git repository' message","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2009-02-16T23:27:20Z","receivedAt":"2009-02-16T23:27:20Z","isPatch":true,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"El 16/2/2009, a las 23:58, Johannes Schindelin escribió:\n\n> It might cause less head-scratching to say 'nor any of the parent\n> directories' than 'or ...' after saying that this is not a git\n> repository.\n>\n> -\t\t\tdie(\"Not a git repository (or any of the parent directories): \n> %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n> +\t\t\tdie(\"Not a git repository (nor any of the parent directories): \n> %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n\nOr could just avoid the whole \"or/nor\" construct entirely by just \nsaying?\n\n \"Not inside a git repository\"\n"},{"id":"105029","messageId":"7vd4diez2z.fsf@gitster.siamese.dyndns.org","threadId":"17834","inReplyTo":"8787c5894e7831bbd1ace3b2fd6649f1362d4b78.1234825069u.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] Minor grammar fix in the 'Not a git repository' message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-16T23:33:56Z","receivedAt":"2009-02-16T23:33:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> It might cause less head-scratching to say 'nor any of the parent\n> directories' than 'or ...' after saying that this is not a git\n> repository.\n> ...\n> +\t\t\tdie(\"Not a git repository (nor any of the parent directories): %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n> \t\t}\n> \t\tif (chdir(\"..\"))\n> \t\t\tdie(\"Cannot change to %s/..: %s\", cwd, strerror(errno));\n\nThe grammar may be more correct, but I wonder if the parenthesised part is\nadding any value to the message or instead it is making the message more\nconfusing.\n\nYou will get this message when you are in /a/b/c/d and no .git\nsubdirectory was found in /a/b/c/d, nor in /a/b/c, nor in /a/b,...\n\nBut the message sounds as if the command expected \".git\" to be either (1)\na git repository (which is false, because \".git\" would mean /a/b/c/d/.git\nand there is no git repository there), or (2) a parent directory (of\nsomething unspecified, but a natural interpretation is \"where you are\"),\ni.e. \"I wanted you to be somewhere inside .git\". That obviously is not\nwhat you wanted to say.\n\n \"No git repository \".git\" found here nor in any of the parent directories\"\n\nmight be an improvement, though.\n"},{"id":"105032","messageId":"20090217001747.GA23278@vidovic","threadId":"17834","inReplyTo":"7vd4diez2z.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Re: Minor grammar fix in the 'Not a git repository' message","fromName":"Nicolas Sebrecht","fromEmail":"nicolas.s-dev@laposte.net","sentAt":"2009-02-17T00:17:47Z","receivedAt":"2009-02-17T00:17:47Z","isPatch":true,"sender":{"key":"nicolas.s-dev@laposte.net","avatar":null},"body":"\nOn Mon, Feb 16, 2009 at 03:33:56PM -0800, Junio C Hamano wrote:\n\n> \"No git repository \".git\" found here nor in any of the parent directories\"\n\nWhat about bare repositories ? \n\nThe message\n\t\"Not inside a git repository\" \nof Wincent looks like the clearest and the fairest one.\n\n-- \nNicolas Sebrecht\n"},{"id":"105039","messageId":"7vk57pevig.fsf@gitster.siamese.dyndns.org","threadId":"17834","inReplyTo":"20090217001747.GA23278@vidovic","subject":"Re: [PATCH] Re: Minor grammar fix in the 'Not a git repository' message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-17T00:51:03Z","receivedAt":"2009-02-17T00:51:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nicolas Sebrecht writes:\n\n> The message\n> \t\"Not inside a git repository\" \n> of Wincent looks like the clearest and the fairest one.\n\nI tend to agree. I was only trying to see if we can salvage a more\nprecise diagnosis f66bc5f (Always show which directory is not a git\nrepository, 2008-12-22) tried to give users, but to do it throughly the\nsentence will become even more awkward.\n\n \"Not inside a bare git repository nor a work tree that has .git/ somewhere in it.\"\n"},{"id":"105068","messageId":"200902162116.55484.bss@iguanasuicide.net","threadId":"17834","inReplyTo":"7vk57pevig.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Re: Minor grammar fix in the 'Not a git repository' message","fromName":"Boyd Stephen Smith Jr.","fromEmail":"bss@iguanasuicide.net","sentAt":"2009-02-17T03:16:54Z","receivedAt":"2009-02-17T03:16:54Z","isPatch":true,"sender":{"key":"bss@iguanasuicide.net","avatar":"https://gravatar.com/avatar/84b95eeff194b816c1568b1339e63e4b229825298664a9037b9f1ec713ead1e3?d=mp&s=160"},"body":"On Monday 16 February 2009 18:51:03 Junio C Hamano wrote:\n> Nicolas Sebrecht writes:\n> > The message\n> > \t\"Not inside a git repository\"\n> > of Wincent looks like the clearest and the fairest one.\n>\n> I tend to agree. I was only trying to see if we can salvage a more\n> precise diagnosis f66bc5f (Always show which directory is not a git\n> repository, 2008-12-22) tried to give users.\n\n\"Not in a git repository or work tree: %s\", DEFAULT_GIT_DIR_ENVIRONMENT\n?\n-- \nBoyd Stephen Smith Jr. ,= ,-_-. =.\nbss@iguanasuicide.net ((_/)o o(\\_))\nICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'\nhttp://iguanasuicide.net/ \\_/\n\n"},{"id":"105102","messageId":"20090217085028.GB7338@lars.home.noschinski.de","threadId":"17834","inReplyTo":"7vk57pevig.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Re: Minor grammar fix in the 'Not a git repository' message","fromName":"Lars Noschinski","fromEmail":"lars@public.noschinski.de","sentAt":"2009-02-17T08:50:29Z","receivedAt":"2009-02-17T08:50:29Z","isPatch":true,"sender":{"key":"lars@public.noschinski.de","avatar":"https://gravatar.com/avatar/ca62bd8b265f2e26c89d39a4bfe7e390bfa6b16d6400e186e222d1c2382c66f2?d=mp&s=160"},"body":"* Junio C Hamano [09-02-17 01:51]:\n>Nicolas Sebrecht writes:\n>\n>> The message\n>> \t\"Not inside a git repository\" \n>> of Wincent looks like the clearest and the fairest one.\n>\n>I tend to agree. I was only trying to see if we can salvage a more\n>precise diagnosis f66bc5f (Always show which directory is not a git\n>repository, 2008-12-22) tried to give users, but to do it throughly the\n>sentence will become even more awkward.\n>\n> \"Not inside a bare git repository nor a work tree that has .git/ somewhere in it.\"\n\nI think f66bc5f used the wrong path for the error message.\nIf the comment above this part of the code is accurate, cwd\nis which should be belonging to a git repository, so I would suggest\n\n die(\"Not inside a git repository: %s\", cwd)\n\n - Lars.\n"},{"id":"105110","messageId":"m31vtxtntf.fsf@localhost.localdomain","threadId":"17834","inReplyTo":"200902162116.55484.bss@iguanasuicide.net","subject":"Re: [PATCH] Re: Minor grammar fix in the 'Not a git repository' message","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-02-17T09:29:27Z","receivedAt":"2009-02-17T09:29:27Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"Boyd Stephen Smith Jr.\" writes:\n> On Monday 16 February 2009 18:51:03 Junio C Hamano wrote:\n> > Nicolas Sebrecht writes:\n\n> > > The message\n> > > \t\"Not inside a git repository\"\n> > > of Wincent looks like the clearest and the fairest one.\n> >\n> > I tend to agree. I was only trying to see if we can salvage a more\n> > precise diagnosis f66bc5f (Always show which directory is not a git\n> > repository, 2008-12-22) tried to give users.\n> \n> \"Not in a git repository or work tree: %s\", DEFAULT_GIT_DIR_ENVIRONMENT\n> ?\n\n\"Not in a git repository or in a work tree: %s\" perhaps...\ncwd or DEFAULT_GIT_DIR_ENVIRONMENT?\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}