undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6031-test-merge-recursive: do not forget to add file to be committed

Browse Source 
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2014-09-21 22:38:17 +02:00 committed by Junio C Hamano
parent e6aaa39347
commit 8c3419bdbd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/t6031-merge-recursive.sh
View File

@ -14,6 +14,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
git commit -m a && git commit -m a &&
git checkout -b b1 master && git checkout -b b1 master &&
test_chmod +x file1 && test_chmod +x file1 &&
git add file1 &&
git commit -m b1 && git commit -m b1 &&
git checkout a1 && git checkout a1 &&
git merge-recursive master -- a1 b1 && git merge-recursive master -- a1 b1 &&