{"thread":{"id":"13363","subject":"[PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","startedAt":"2008-05-03T07:08:42Z","lastAt":"2008-05-06T21:50:56Z","messageCount":13,"participants":["Tim Harper","Johannes Schindelin","Matt Graham","Junio C Hamano","Avery Pennarun","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75903","messageId":"1209798522-13618-1-git-send-email-timcharper@gmail.com","threadId":"13363","inReplyTo":null,"subject":"[PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Tim Harper","fromEmail":"timcharper@gmail.com","sentAt":"2008-05-03T07:08:42Z","receivedAt":"2008-05-03T07:08:42Z","isPatch":true,"sender":{"key":"timcharper@gmail.com","avatar":"https://gravatar.com/avatar/1a2e0c06c7862ff065ee6b1d53195333a5a0577c040ecb2856a150d8e0b00ecd?d=mp&s=160"},"body":"---\n read-cache.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex a92b25b..971667d 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p\n \t\t\t}\n \t\t\tif (quiet)\n \t\t\t\tcontinue;\n-\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n+\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n \t\t\thas_errors = 1;\n \t\t\tcontinue;\n \t\t}\n-- \n1.5.5.1\n"},{"id":"75933","messageId":"alpine.DEB.1.00.0805031509170.30431@racer","threadId":"13363","inReplyTo":"1209798522-13618-1-git-send-email-timcharper@gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-05-03T14:09:42Z","receivedAt":"2008-05-03T14:09:42Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nthe subject is a nice joke ;-)\n\n\nOn Sat, 3 May 2008, Tim Harper wrote:\n\n> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n\nHow about \"local changes\"?\n\nCiao,\nDscho\n"},{"id":"75940","messageId":"1c5969370805030824h3ecdb967ub0c57f6fc9cbba58@mail.gmail.com","threadId":"13363","inReplyTo":"1209798522-13618-1-git-send-email-timcharper@gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Matt Graham","fromEmail":"mdg149@gmail.com","sentAt":"2008-05-03T15:24:02Z","receivedAt":"2008-05-03T15:24:02Z","isPatch":true,"sender":{"key":"mdg149@gmail.com","avatar":"https://gravatar.com/avatar/a1f130a60a6550f75e8d7d3849e58e46494f36bfaf764a38cfd695ac85de8576?d=mp&s=160"},"body":"On Sat, May 3, 2008 at 3:08 AM, Tim Harper wrote:\n> ---\n> read-cache.c | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/read-cache.c b/read-cache.c\n> index a92b25b..971667d 100644\n> --- a/read-cache.c\n> +++ b/read-cache.c\n> @@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p\n> }\n> if (quiet)\n> continue;\n> - printf(\"%s: needs update\\n\", ce->name);\n> + printf(\"%s: has changes\\n\", ce->name);\n> has_errors = 1;\n> continue;\n> }\n> --\n> 1.5.5.1\n\nYes, \"needs update\" is definitely cryptic and confusing.\n"},{"id":"75941","messageId":"E49F9E2F-A773-4B9E-A4FE-3A764D86803F@gmail.com","threadId":"13363","inReplyTo":"alpine.DEB.1.00.0805031509170.30431@racer","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Tim Harper","fromEmail":"timcharper@gmail.com","sentAt":"2008-05-03T16:19:46Z","receivedAt":"2008-05-03T16:19:46Z","isPatch":true,"sender":{"key":"timcharper@gmail.com","avatar":"https://gravatar.com/avatar/1a2e0c06c7862ff065ee6b1d53195333a5a0577c040ecb2856a150d8e0b00ecd?d=mp&s=160"},"body":"heh heh - yeah, I used git to send the email and it just sent that \nhuge honkin line.\n\nI like \"local changes\".\n\nThere's a bunch of lines that say \"not uptodate\". I'll look for them \nall and resend the patch.\n\nThanks,\nTim\n\nOn May 3, 2008, at 8:09 AM, Johannes Schindelin wrote:\n\n> Hi,\n>\n> the subject is a nice joke ;-)\n>\n>\n> On Sat, 3 May 2008, Tim Harper wrote:\n>\n>> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n>> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n>\n> How about \"local changes\"?\n>\n> Ciao,\n> Dscho\n>\n"},{"id":"75942","messageId":"7v3aozwcj6.fsf@gitster.siamese.dyndns.org","threadId":"13363","inReplyTo":"alpine.DEB.1.00.0805031509170.30431@racer","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-03T16:57:49Z","receivedAt":"2008-05-03T16:57:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Sat, 3 May 2008, Tim Harper wrote:\n>\n>> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n>> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n>\n> How about \"local changes\"?\n\nAren't there Porcelain and end-user scripts that relies on the output by\ndoing \"sed -ne s'/: needs update$//p\"?\n"},{"id":"75957","messageId":"3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com","threadId":"13363","inReplyTo":"7v3aozwcj6.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Tim Harper","fromEmail":"timcharper@gmail.com","sentAt":"2008-05-03T20:10:48Z","receivedAt":"2008-05-03T20:10:48Z","isPatch":true,"sender":{"key":"timcharper@gmail.com","avatar":"https://gravatar.com/avatar/1a2e0c06c7862ff065ee6b1d53195333a5a0577c040ecb2856a150d8e0b00ecd?d=mp&s=160"},"body":"I ran all of the tests with the patch apply, and they all pass. Is \nthat enough indication?\n\nTim\n\nOn May 3, 2008, at 10:57 AM, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n>\n>> On Sat, 3 May 2008, Tim Harper wrote:\n>>\n>>> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n>>> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n>>\n>> How about \"local changes\"?\n>\n> Aren't there Porcelain and end-user scripts that relies on the \n> output by\n> doing \"sed -ne s'/: needs update$//p\"?\n>\n"},{"id":"75963","messageId":"7v63tvszgo.fsf@gitster.siamese.dyndns.org","threadId":"13363","inReplyTo":"3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-04T00:08:23Z","receivedAt":"2008-05-04T00:08:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tim Harper writes:\n\nbecause it is very hard to follow the flow of thought.\nPlease do not top post.\n\n> On May 3, 2008, at 10:57 AM, Junio C Hamano wrote:\n>\n>> Johannes Schindelin writes:\n>>\n>>> On Sat, 3 May 2008, Tim Harper wrote:\n>>>\n>>>> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n>>>> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n>>>\n>>> How about \"local changes\"?\n>>\n>> Aren't there Porcelain and end-user scripts that relies on the\n>> output by\n>> doing \"sed -ne s'/: needs update$//p\"?\n\n> I ran all of the tests with the patch apply, and they all pass. Is\n> that enough indication?\n\nOf course not. Where does end-user scripts come into play when you are\nrunning the testsuite?\n"},{"id":"75965","messageId":"32541b130805031721n29cf470cx391fe0e8b4943706@mail.gmail.com","threadId":"13363","inReplyTo":"7v63tvszgo.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2008-05-04T00:21:53Z","receivedAt":"2008-05-04T00:21:53Z","isPatch":true,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On 5/3/08, Junio C Hamano wrote:\n> > I ran all of the tests with the patch apply, and they all pass. Is\n> > that enough indication?\n>\n> Of course not. Where does end-user scripts come into play when you are\n> running the testsuite?\n\nI thought user scripts weren't supposed to rely on the porcelain\noutput? It seems to change rather frequently anyway.\n\nAvery\n"},{"id":"75967","messageId":"7vtzhesvxu.fsf@gitster.siamese.dyndns.org","threadId":"13363","inReplyTo":"32541b130805031721n29cf470cx391fe0e8b4943706@mail.gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-04T01:24:29Z","receivedAt":"2008-05-04T01:24:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Avery Pennarun\" writes:\n\n> On 5/3/08, Junio C Hamano wrote:\n>> > I ran all of the tests with the patch apply, and they all pass. Is\n>> > that enough indication?\n>>\n>> Of course not. Where does end-user scripts come into play when you are\n>> running the testsuite?\n>\n> I thought user scripts weren't supposed to rely on the porcelain\n> output? It seems to change rather frequently anyway.\n\nWasn't the patch about changing output from \"update-index --refresh\",\nwhich is as low as you can get?\n"},{"id":"75997","messageId":"alpine.DEB.1.00.0805041027150.30431@racer","threadId":"13363","inReplyTo":"7v3aozwcj6.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-05-04T09:29:26Z","receivedAt":"2008-05-04T09:29:26Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 3 May 2008, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > On Sat, 3 May 2008, Tim Harper wrote:\n> >\n> >> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n> >> +\t\t\tprintf(\"%s: has changes\\n\", ce->name);\n> >\n> > How about \"local changes\"?\n> \n> Aren't there Porcelain and end-user scripts that relies on the output by\n> doing \"sed -ne s'/: needs update$//p\"?\n\nPotentially. But I thought that it would make more sense to use \n--name-only in that case.\n\nHowever, I obviously like that you go out of your way to cause the least \ndamage to current users, so how about something like in merge-recursive, \nwhere you can change some output based on an environment variable?\n\nIn this case, I'd rather make it an option, but that may be overkill. But \nthen, enough people have commented that this message is irritating them.\n\nCiao,\nDscho\n"},{"id":"76139","messageId":"32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com","threadId":"13363","inReplyTo":"7vtzhesvxu.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2008-05-05T16:35:06Z","receivedAt":"2008-05-05T16:35:06Z","isPatch":true,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On 5/3/08, Junio C Hamano wrote:\n> \"Avery Pennarun\" writes:\n> > On 5/3/08, Junio C Hamano wrote:\n> >> Of course not. Where does end-user scripts come into play when you are\n> >> running the testsuite?\n> >\n> > I thought user scripts weren't supposed to rely on the porcelain\n> > output? It seems to change rather frequently anyway.\n>\n> Wasn't the patch about changing output from \"update-index --refresh\",\n> which is as low as you can get?\n\nHmm, perhaps the problem then is that we're using plumbing output and\npresenting it to the user as part of the porcelain. Is there an\nelegant way to fix that?\n\nAvery\n"},{"id":"76144","messageId":"20080505170512.GD17863@sigill.intra.peff.net","threadId":"13363","inReplyTo":"32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-05-05T17:05:12Z","receivedAt":"2008-05-05T17:05:12Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, May 05, 2008 at 12:35:06PM -0400, Avery Pennarun wrote:\n\n> Hmm, perhaps the problem then is that we're using plumbing output and\n> presenting it to the user as part of the porcelain. Is there an\n> elegant way to fix that?\n\n2>&1 | sed 's/needs update/has local changes/' ?\n\nOh wait, you said elegant...\n\n-Peff\n"},{"id":"76225","messageId":"F1DEC707-3E1B-4211-9F97-171D01B13A8E@gmail.com","threadId":"13363","inReplyTo":"32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com","subject":"Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see \"file.txt: needs update\". \"file.txt: has changes\" is much clearer.","fromName":"Tim Harper","fromEmail":"timcharper@gmail.com","sentAt":"2008-05-06T21:50:56Z","receivedAt":"2008-05-06T21:50:56Z","isPatch":true,"sender":{"key":"timcharper@gmail.com","avatar":"https://gravatar.com/avatar/1a2e0c06c7862ff065ee6b1d53195333a5a0577c040ecb2856a150d8e0b00ecd?d=mp&s=160"},"body":"Yeah: I was thinking about it earlier and came at the same conclusion.\n\nThere's a \"porcelain\" interface for a lot of commands. Does the \nconcept need to be furthered for this case?\n\nOn another note - I've been running with this change for several days, \nand everything seems to be alright.\n\nTim\n\n\n\nOn May 5, 2008, at 10:35 AM, Avery Pennarun wrote:\n\n> On 5/3/08, Junio C Hamano wrote:\n>> \"Avery Pennarun\" writes:\n>>> On 5/3/08, Junio C Hamano wrote:\n>>>> Of course not. Where does end-user scripts come into play when \n>>>> you are\n>>>> running the testsuite?\n>>>\n>>> I thought user scripts weren't supposed to rely on the porcelain\n>>> output? It seems to change rather frequently anyway.\n>>\n>> Wasn't the patch about changing output from \"update-index --refresh\",\n>> which is as low as you can get?\n>\n> Hmm, perhaps the problem then is that we're using plumbing output and\n> presenting it to the user as part of the porcelain. Is there an\n> elegant way to fix that?\n>\n> Avery\n"}]}