development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a test for merging changed and rename-changed branches

Browse source 
Also leave a warning for future merge-recursive explorers.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alex Riesen 2007-04-25 22:07:45 +02:00 committed by Junio C Hamano
parent c135ee88f8
commit 8a35981927
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
merge-recursive.c
View file

@ -1345,6 +1345,11 @@ static int process_renames(struct path_list *a_renames,
if (mfi.merge && mfi.clean && if (mfi.merge && mfi.clean &&
sha_eq(mfi.sha, ren1->pair->two->sha1) && sha_eq(mfi.sha, ren1->pair->two->sha1) &&
mfi.mode == ren1->pair->two->mode) mfi.mode == ren1->pair->two->mode)
/*
* This messaged is part of
* t6022 test. If you change
* it update the test too.
*/
output(3, "Skipped %s (merged same as existing)", ren1_dst); output(3, "Skipped %s (merged same as existing)", ren1_dst);
else { else {
if (mfi.merge || !mfi.clean) if (mfi.merge || !mfi.clean)

23
t/t6022-merge-rename.sh
View file

@ -47,6 +47,8 @@ git branch white &&
git branch red && git branch red &&
git branch blue && git branch blue &&
git branch yellow && git branch yellow &&
git branch change &&
git branch change+rename &&
sed -e "/^g /s/.*/g : master changes a line/" <A >A+ && sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
mv A+ A && mv A+ A &&
@ -77,6 +79,17 @@ rm -f A M &&
git update-index --add --remove A C M N && git update-index --add --remove A C M N &&
git commit -m "blue renames A->C, M->N" && git commit -m "blue renames A->C, M->N" &&
git checkout change &&
sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
mv A+ A &&
git commit -q -a -m "changed" &&
git checkout change+rename &&
sed -e "/^g /s/.*/g : changed line/" <A >B &&
rm A &&
git update-index --add B &&
git commit -q -a -m "changed and renamed" &&
git checkout master' git checkout master'
test_expect_success 'pull renaming branch into unrenaming one' \ test_expect_success 'pull renaming branch into unrenaming one' \
@ -318,4 +331,14 @@ test_expect_success 'interference with untracked working tree file' '
git reset --hard anchor git reset --hard anchor
' '
test_expect_success 'merge of identical changes in a renamed file' '
rm -f A M N
git reset --hard &&
git checkout change+rename &&
GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" &&
git reset --hard HEAD^ &&
git checkout change &&
GIT_MERGE_VERBOSITY=3 git merge change+rename | grep "^Skipped B"
'
test_done test_done