git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Dec 6, 2016, 19:31 UTC
Message-ID
<20161206193154.vf7cd7lk5gyxrra5@sigill.intra.peff.net>
In-Reply-To
<xmqqh96g27bh.fsf@gitster.mtv.corp.google.com>
On Tue, Dec 06, 2016 at 11:20:18AM -0800, Junio C Hamano wrote:
Show 15 quoted lines
> Jeff King <peff@peff.net> 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 diff" here, not the plumbing,
> though.

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.

Though I'm not sure that "git add -u" would not accomplish the same thing as these several commands.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 13 in “Bug: stash staged file move loses original file deletion”
  1. Matthew PateyDec 5, 2016
  2. Jeff KingDec 6, 2016
  3. Jeff KingDec 6, 2016
  4. stash: disable renames when calling git-diffJeff King, Dec 6, 2016
  5. Junio C HamanoDec 6, 2016
  6. Jeff KingDec 6, 2016
  7. Junio C HamanoDec 6, 2016
  8. Jeff KingDec 6, 2016
  9. Junio C HamanoDec 6, 2016
  10. Jeff KingDec 6, 2016
  11. Junio C HamanoDec 6, 2016
  12. Jeff KingDec 6, 2016
  13. Junio C HamanoDec 6, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.