t6022: Add testcase for spurious "refusing to lose untracked" messages
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 11, 2011 at 23:20 UTC
3f680ff0cf41c80b5c3a7ef4e7b417c0aa788dfb
1 file changed
+26
t/t6022-merge-rename.sh
+26
@@ -767,4 +767,30 @@ test_expect_success 'merge rename into master has correct extended markers' '
767
test_cmp expected renamed_file
768
'
769
770
+test_expect_success 'setup spurious "refusing to lose untracked" message' '
771
+ git rm -rf . &&
772
+ git clean -fdqx &&
773
+ rm -rf .git &&
774
+ git init &&
775
+
776
+ > irrelevant_file &&
777
+ printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
778
+ git add irrelevant_file original_file &&
779
+ git commit -mA &&
780
+
781
+ git checkout -b rename &&
782
+ git mv original_file renamed_file &&
783
+ git commit -mB &&
784
+
785
+ git checkout master &&
786
+ git rm original_file &&
787
+ git commit -mC
788
+'
789
+
790
+test_expect_failure 'no spurious "refusing to lose untracked" message' '
791
+ git checkout master^0 &&
792
+ test_must_fail git merge rename^0 2>errors.txt &&
793
+ ! grep "refusing to lose untracked file" errors.txt
794
+'
795
+
796
test_done