diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-21 00:09:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-21 00:49:21 +0200 |
| commit | 9ca8f6079cdb199851636c719900472a9745885f (patch) | |
| tree | 0647b366e94f239e4485ee9ed6eafe8e9d63dd87 /t/t7600-merge.sh | |
| parent | completion: find out supported merge strategies correctly (diff) | |
| download | git-9ca8f6079cdb199851636c719900472a9745885f.tar.xz git-9ca8f6079cdb199851636c719900472a9745885f.zip | |
"git-merge": allow fast-forwarding in a stat-dirty tree
We used to refresh the index to clear stat-dirtyness before a fast-forward
merge. Recent C rewrite forgot to do this.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5eeb6c2b27..fee8fb77d4 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -488,4 +488,14 @@ test_expect_success 'merge c1 with c1 and c2' ' test_debug 'gitk --all' +test_expect_success 'merge fast-forward in a dirty tree' ' + git reset --hard c0 && + mv file file1 && + cat file1 >file && + rm -f file1 && + git merge c2 +' + +test_debug 'gitk --all' + test_done |