Re: [PATCH] stash: disable renames when calling git-diff
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 6, 2016, 20:36 UTC
- Message-ID
- <xmqqtwagztfz.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20161206202521.zxgxqsetgqejsyl3@sigill.intra.peff.net>
Jeff King <peff@peff.net> 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 reasonably sure that "diff HEAD" and "diff-index HEAD" would behave identically.
Show 9 quoted lines
> @@ -115,7 +115,7 @@ create_stash () {
> git read-tree --index-output="$TMPindex" -m $i_tree &&
> GIT_INDEX_FILE="$TMPindex" &&
> export GIT_INDEX_FILE &&
> - git diff --name-only -z HEAD -- >"$TMP-stagenames" &&
> + git diff-index --name-only -z HEAD -- >"$TMP-stagenames" &&
> git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
> git write-tree &&
> rm -f "$TMPindex"Will queue this one instead. Thanks.