diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
| commit | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (patch) | |
| tree | e03a7afb1884d2b4f8f1e45ee6a945baebd95806 /t/t4200-rerere.sh | |
| parent | 1a56be134f9477296a7ade040e8b802bf3a643a1 (diff) | |
| download | git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.gz git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.xz | |
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Introduce a command line option to override rerere.autoupdate configuration
variable to make it more useful.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index a6bc028a5..bb402c378 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -217,7 +217,22 @@ test_expect_success 'rerere.autoupdate' ' git checkout version2 && test_must_fail git merge fifth && test 0 = $(git ls-files -u | wc -l) +' +test_expect_success 'merge --rerere-autoupdate' ' + git config --unset rerere.autoupdate + git reset --hard && + git checkout version2 && + test_must_fail git merge --rerere-autoupdate fifth && + test 0 = $(git ls-files -u | wc -l) +' + +test_expect_success 'merge --no-rerere-autoupdate' ' + git config rerere.autoupdate true + git reset --hard && + git checkout version2 && + test_must_fail git merge --no-rerere-autoupdate fifth && + test 2 = $(git ls-files -u | wc -l) ' test_done |