diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-22 13:04:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-22 13:06:58 +0400 |
| commit | 121c813f8d6054dbee25c03301599c0f8d645d7f (patch) | |
| tree | 36247d4df76782c03eef692bb8843502994bad52 /t/t4200-rerere.sh | |
| parent | 7f8365f894d60f240edd356f32e3c1bda994ed41 (diff) | |
rerere.autoupdate
When this configuration is set, paths that are autoresolved by git-rerere
are updated in the index as well.
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index afb3e3d176..a64727d5ad 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -193,9 +193,19 @@ test_expect_success 'resolution was recorded properly' ' echo Bello > file3 && git add file3 && git commit -m version2 && + git tag version2 && test_must_fail git merge fifth && test Cello = "$(cat file3)" && test 0 != $(git ls-files -u | wc -l) ' +test_expect_success 'rerere.autoupdate' ' + git config rerere.autoupdate true + git reset --hard && + git checkout version2 && + test_must_fail git merge fifth && + test 0 = $(git ls-files -u | wc -l) + +' + test_done |