# [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. 13 messages from 2008-05-03 to 2008-05-06. Participants: Tim Harper, Johannes Schindelin, Matt Graham, Junio C Hamano, Avery Pennarun, Jeff King. Thread: https://gitlist.dev/t/13363 ## Tim Harper, 2008-05-03 07:08 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. Message-ID: <1209798522-13618-1-git-send-email-timcharper@gmail.com> URL: https://gitlist.dev/e/1209798522-13618-1-git-send-email-timcharper%40gmail.com ``` --- read-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/read-cache.c b/read-cache.c index a92b25b..971667d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p } if (quiet) continue; - printf("%s: needs update\n", ce->name); + printf("%s: has changes\n", ce->name); has_errors = 1; continue; } -- 1.5.5.1 ``` ## Johannes Schindelin, 2008-05-03 14:09 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. Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0805031509170.30431%40racer In-Reply-To: <1209798522-13618-1-git-send-email-timcharper@gmail.com> ``` Hi, the subject is a nice joke ;-) On Sat, 3 May 2008, Tim Harper wrote: > - printf("%s: needs update\n", ce->name); > + printf("%s: has changes\n", ce->name); How about "local changes"? Ciao, Dscho ``` ## Matt Graham, 2008-05-03 15:24 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. Message-ID: <1c5969370805030824h3ecdb967ub0c57f6fc9cbba58@mail.gmail.com> URL: https://gitlist.dev/e/1c5969370805030824h3ecdb967ub0c57f6fc9cbba58%40mail.gmail.com In-Reply-To: <1209798522-13618-1-git-send-email-timcharper@gmail.com> ``` On Sat, May 3, 2008 at 3:08 AM, Tim Harper wrote: > --- > read-cache.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/read-cache.c b/read-cache.c > index a92b25b..971667d 100644 > --- a/read-cache.c > +++ b/read-cache.c > @@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p > } > if (quiet) > continue; > - printf("%s: needs update\n", ce->name); > + printf("%s: has changes\n", ce->name); > has_errors = 1; > continue; > } > -- > 1.5.5.1 Yes, "needs update" is definitely cryptic and confusing. ``` ## Tim Harper, 2008-05-03 16:19 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. Message-ID: URL: https://gitlist.dev/e/E49F9E2F-A773-4B9E-A4FE-3A764D86803F%40gmail.com In-Reply-To: ``` heh heh - yeah, I used git to send the email and it just sent that huge honkin line. I like "local changes". There's a bunch of lines that say "not uptodate". I'll look for them all and resend the patch. Thanks, Tim On May 3, 2008, at 8:09 AM, Johannes Schindelin wrote: > Hi, > > the subject is a nice joke ;-) > > > On Sat, 3 May 2008, Tim Harper wrote: > >> - printf("%s: needs update\n", ce->name); >> + printf("%s: has changes\n", ce->name); > > How about "local changes"? > > Ciao, > Dscho > ``` ## Junio C Hamano, 2008-05-03 16:57 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. Message-ID: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v3aozwcj6.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Johannes Schindelin writes: > On Sat, 3 May 2008, Tim Harper wrote: > >> - printf("%s: needs update\n", ce->name); >> + printf("%s: has changes\n", ce->name); > > How about "local changes"? Aren't there Porcelain and end-user scripts that relies on the output by doing "sed -ne s'/: needs update$//p"? ``` ## Tim Harper, 2008-05-03 20:10 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. Message-ID: <3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com> URL: https://gitlist.dev/e/3DE78C03-DA35-4CB5-8D3D-0529A89065EC%40gmail.com In-Reply-To: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org> ``` I ran all of the tests with the patch apply, and they all pass. Is that enough indication? Tim On May 3, 2008, at 10:57 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> On Sat, 3 May 2008, Tim Harper wrote: >> >>> - printf("%s: needs update\n", ce->name); >>> + printf("%s: has changes\n", ce->name); >> >> How about "local changes"? > > Aren't there Porcelain and end-user scripts that relies on the > output by > doing "sed -ne s'/: needs update$//p"? > ``` ## Junio C Hamano, 2008-05-04 00:08 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. Message-ID: <7v63tvszgo.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v63tvszgo.fsf%40gitster.siamese.dyndns.org In-Reply-To: <3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com> ``` Tim Harper writes: because it is very hard to follow the flow of thought. Please do not top post. > On May 3, 2008, at 10:57 AM, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >>> On Sat, 3 May 2008, Tim Harper wrote: >>> >>>> - printf("%s: needs update\n", ce->name); >>>> + printf("%s: has changes\n", ce->name); >>> >>> How about "local changes"? >> >> Aren't there Porcelain and end-user scripts that relies on the >> output by >> doing "sed -ne s'/: needs update$//p"? > I ran all of the tests with the patch apply, and they all pass. Is > that enough indication? Of course not. Where does end-user scripts come into play when you are running the testsuite? ``` ## Avery Pennarun, 2008-05-04 00:21 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. Message-ID: <32541b130805031721n29cf470cx391fe0e8b4943706@mail.gmail.com> URL: https://gitlist.dev/e/32541b130805031721n29cf470cx391fe0e8b4943706%40mail.gmail.com In-Reply-To: <7v63tvszgo.fsf@gitster.siamese.dyndns.org> ``` On 5/3/08, Junio C Hamano wrote: > > I ran all of the tests with the patch apply, and they all pass. Is > > that enough indication? > > Of course not. Where does end-user scripts come into play when you are > running the testsuite? I thought user scripts weren't supposed to rely on the porcelain output? It seems to change rather frequently anyway. Avery ``` ## Junio C Hamano, 2008-05-04 01:24 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. Message-ID: <7vtzhesvxu.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vtzhesvxu.fsf%40gitster.siamese.dyndns.org In-Reply-To: <32541b130805031721n29cf470cx391fe0e8b4943706@mail.gmail.com> ``` "Avery Pennarun" writes: > On 5/3/08, Junio C Hamano wrote: >> > I ran all of the tests with the patch apply, and they all pass. Is >> > that enough indication? >> >> Of course not. Where does end-user scripts come into play when you are >> running the testsuite? > > I thought user scripts weren't supposed to rely on the porcelain > output? It seems to change rather frequently anyway. Wasn't the patch about changing output from "update-index --refresh", which is as low as you can get? ``` ## Johannes Schindelin, 2008-05-04 09:29 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. Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0805041027150.30431%40racer In-Reply-To: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org> ``` Hi, On Sat, 3 May 2008, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Sat, 3 May 2008, Tim Harper wrote: > > > >> - printf("%s: needs update\n", ce->name); > >> + printf("%s: has changes\n", ce->name); > > > > How about "local changes"? > > Aren't there Porcelain and end-user scripts that relies on the output by > doing "sed -ne s'/: needs update$//p"? Potentially. But I thought that it would make more sense to use --name-only in that case. However, I obviously like that you go out of your way to cause the least damage to current users, so how about something like in merge-recursive, where you can change some output based on an environment variable? In this case, I'd rather make it an option, but that may be overkill. But then, enough people have commented that this message is irritating them. Ciao, Dscho ``` ## Avery Pennarun, 2008-05-05 16:35 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. Message-ID: <32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com> URL: https://gitlist.dev/e/32541b130805050935l7257a5e3t9b44d61abe28db37%40mail.gmail.com In-Reply-To: <7vtzhesvxu.fsf@gitster.siamese.dyndns.org> ``` On 5/3/08, Junio C Hamano wrote: > "Avery Pennarun" writes: > > On 5/3/08, Junio C Hamano wrote: > >> Of course not. Where does end-user scripts come into play when you are > >> running the testsuite? > > > > I thought user scripts weren't supposed to rely on the porcelain > > output? It seems to change rather frequently anyway. > > Wasn't the patch about changing output from "update-index --refresh", > which is as low as you can get? Hmm, perhaps the problem then is that we're using plumbing output and presenting it to the user as part of the porcelain. Is there an elegant way to fix that? Avery ``` ## Jeff King, 2008-05-05 17:05 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. Message-ID: <20080505170512.GD17863@sigill.intra.peff.net> URL: https://gitlist.dev/e/20080505170512.GD17863%40sigill.intra.peff.net In-Reply-To: <32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com> ``` On Mon, May 05, 2008 at 12:35:06PM -0400, Avery Pennarun wrote: > Hmm, perhaps the problem then is that we're using plumbing output and > presenting it to the user as part of the porcelain. Is there an > elegant way to fix that? 2>&1 | sed 's/needs update/has local changes/' ? Oh wait, you said elegant... -Peff ``` ## Tim Harper, 2008-05-06 21:50 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. Message-ID: URL: https://gitlist.dev/e/F1DEC707-3E1B-4211-9F97-171D01B13A8E%40gmail.com In-Reply-To: <32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com> ``` Yeah: I was thinking about it earlier and came at the same conclusion. There's a "porcelain" interface for a lot of commands. Does the concept need to be furthered for this case? On another note - I've been running with this change for several days, and everything seems to be alright. Tim On May 5, 2008, at 10:35 AM, Avery Pennarun wrote: > On 5/3/08, Junio C Hamano wrote: >> "Avery Pennarun" writes: >>> On 5/3/08, Junio C Hamano wrote: >>>> Of course not. Where does end-user scripts come into play when >>>> you are >>>> running the testsuite? >>> >>> I thought user scripts weren't supposed to rely on the porcelain >>> output? It seems to change rather frequently anyway. >> >> Wasn't the patch about changing output from "update-index --refresh", >> which is as low as you can get? > > Hmm, perhaps the problem then is that we're using plumbing output and > presenting it to the user as part of the porcelain. Is there an > elegant way to fix that? > > Avery ```