Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Junio C Hamano
Jeff King writes: > Here it is in patch form. Perhaps I am missing some subtle case that > diff-index would not handle, but it does pass the test suite. And > looking over the original thread, I don't see any particular reason to > prefer git-diff. Ah, our mails crossed ;-) I am

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Jeff King
On Tue, Dec 06, 2016 at 03:11:30PM -0500, Jeff King wrote: > > Yeah, it looks like "add -u" to me, too. Perhaps the script was old > > enough that it didn't exist back then? I dunno. > > Hmm, nope. It _was_ "git add -u" at one point and switched. See > 7aa5d43cc (stash: Don't overwrite files

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> I think you are right that diff-index could work, though. I always >> forget that without "--cached", diff-index looks at the working tree >> files. > > I'll reword the log message while queuing. The last

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Jeff King
On Tue, Dec 06, 2016 at 12:22:25PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I think you are right that diff-index could work, though. I always > > forget that without "--cached", diff-index looks at the working tree > > files. > > I'll reword the log message while

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Junio C Hamano
Jeff King writes: > I think you are right that diff-index could work, though. I always > forget that without "--cached", diff-index looks at the working tree > files. I'll reword the log message while queuing. It was super surprising to me to hear that there was something "git

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Jeff King
On Tue, Dec 06, 2016 at 11:51:16AM -0800, Junio C Hamano wrote: > > I don't think there's a plumbing command which works for diffing the > > working tree directly to a git tree. In the long run, it might be a good > > idea to remedy that. > > I do not think that one is doing anything different

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Junio C Hamano
Jeff King writes: > On Tue, Dec 06, 2016 at 11:20:18AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> >> If you run: >> >> >> >> git -c diff.renames=false stash >> >> >> >> then it works. >> > >> > And here's a patch to fix it. >> >> Yuck. This

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Jeff King
On Tue, Dec 06, 2016 at 11:20:18AM -0800, Junio C Hamano wrote: > Jeff King writes: > > >> If you run: > >> > >> git -c diff.renames=false stash > >> > >> then it works. > > > > And here's a patch to fix it. > > Yuck. This obviously has easier to bite more people since we >

Re: [PATCH] stash: disable renames when calling git-diff

2016-12-06 Thread Junio C Hamano
Jeff King writes: >> If you run: >> >> git -c diff.renames=false stash >> >> then it works. > > And here's a patch to fix it. Yuck. This obviously has easier to bite more people since we enabled the renames by default. Thanks for a quick fix. I wonder why we are using "git