summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-12-06 15:25:21 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-06 14:16:53 -0800
commit9d4e28ead5bf133d014dfc9e9345f6bf083eefea (patch)
treec57aac1e945bec24e9f39b0a223a2a5ac1e5ec00 /t/t3030-merge-recursive.sh
parentGit 2.9 (diff)
downloadtgif-9d4e28ead5bf133d014dfc9e9345f6bf083eefea.tar.xz
stash: prefer plumbing over git-diff
When creating a stash, we need to look at the diff between the working tree and HEAD, and do so using the git-diff porcelain. Because git-diff enables porcelain config like renames by default, this causes at least one problem. The --name-only format will not mention the source side of a rename, meaning we will fail to stash a deletion that is part of a rename. We could fix that case by passing --no-renames, but this is a symptom of a larger problem. We should be using the diff-index plumbing here, which does not have renames enabled by default, and also does not respect any potentially confusing config options. Reported-by: Matthew Patey <matthew.patey2167@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions