diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-10-03 15:02:31 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 08:01:46 -0700 |
| commit | 668f26fff610605d112fbedffae79917de948893 (patch) | |
| tree | 4251bf2b3f245dc1e58e68483f9d93387cde599e /t | |
| parent | tests: add a testcase for "git submodule sync" (diff) | |
| download | tgif-668f26fff610605d112fbedffae79917de948893.tar.xz | |
builtin-merge: refresh the index before calling a strategy
In case a file is touched but has no real changes then we just have to
update the index and should not error out.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 9516f541e9..7313ac278c 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -511,4 +511,13 @@ test_expect_success 'in-index merge' ' test_debug 'gitk --all' +test_expect_success 'refresh the index before merging' ' + git reset --hard c1 && + sleep 1 && + touch file && + git merge c3 +' + +test_debug 'gitk --all' + test_done |