diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:30 (GMT) |
| commit | 12361d025fe0752342dabb06d79ff541eb081002 (patch) | |
| tree | 1e21891f5db927b2bc7293cd81d003d8c03f0292 /t | |
| parent | 5ce6f51ff78bcb847c6c4835d80f6b58d730a8de (diff) | |
| parent | 9d4e28ead5bf133d014dfc9e9345f6bf083eefea (diff) | |
| download | git-12361d025fe0752342dabb06d79ff541eb081002.zip git-12361d025fe0752342dabb06d79ff541eb081002.tar.gz git-12361d025fe0752342dabb06d79ff541eb081002.tar.bz2 | |
Merge branch 'jk/stash-disable-renames-internally' into maint
When diff.renames configuration is on (and with Git 2.9 and later,
it is enabled by default, which made it worse), "git stash"
misbehaved if a file is removed and another file with a very
similar content is added.
* jk/stash-disable-renames-internally:
stash: prefer plumbing over git-diff
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index e1a6ccc..2de3e18 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -766,4 +766,13 @@ test_expect_success 'stash list --cc shows combined diff' ' test_cmp expect actual ' +test_expect_success 'stash is not confused by partial renames' ' + mv file renamed && + git add renamed && + git stash && + git stash apply && + test_path_is_file renamed && + test_path_is_missing file +' + test_done |