{"thread":{"id":"7847","subject":"[PATCH] Add a test for merging changed and rename-changed branches","startedAt":"2007-04-25T20:07:45Z","lastAt":"2007-04-25T20:07:45Z","messageCount":1,"participants":["Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"40437","messageId":"20070425200745.GC30061@steel.home","threadId":"7847","inReplyTo":null,"subject":"[PATCH] Add a test for merging changed and rename-changed branches","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-04-25T20:07:45Z","receivedAt":"2007-04-25T20:07:45Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Also leave a warning for future merge-recursive explorers.\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n merge-recursive.c       |    5 +++++\n t/t6022-merge-rename.sh |   23 +++++++++++++++++++++++\n 2 files changed, 28 insertions(+), 0 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 37f1ba9..094ac59 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1345,6 +1345,11 @@ static int process_renames(struct path_list *a_renames,\n \t\t\t\tif (mfi.merge && mfi.clean &&\n \t\t\t\t    sha_eq(mfi.sha, ren1->pair->two->sha1) &&\n \t\t\t\t    mfi.mode == ren1->pair->two->mode)\n+\t\t\t\t\t/*\n+\t\t\t\t\t * This messaged is part of\n+\t\t\t\t\t * t6022 test. If you change\n+\t\t\t\t\t * it update the test too.\n+\t\t\t\t\t */\n \t\t\t\t\toutput(3, \"Skipped %s (merged same as existing)\", ren1_dst);\n \t\t\t\telse {\n \t\t\t\t\tif (mfi.merge || !mfi.clean)\ndiff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh\nindex 99817de..200d9fe 100755\n--- a/t/t6022-merge-rename.sh\n+++ b/t/t6022-merge-rename.sh\n@@ -47,6 +47,8 @@ git branch white &&\n git branch red &&\n git branch blue &&\n git branch yellow &&\n+git branch change &&\n+git branch change+rename &&\n \n sed -e \"/^g /s/.*/g : master changes a line/\" <A >A+ &&\n mv A+ A &&\n@@ -77,6 +79,17 @@ rm -f A M &&\n git update-index --add --remove A C M N &&\n git commit -m \"blue renames A->C, M->N\" &&\n \n+git checkout change &&\n+sed -e \"/^g /s/.*/g : changed line/\" <A >A+ &&\n+mv A+ A &&\n+git commit -q -a -m \"changed\" &&\n+\n+git checkout change+rename &&\n+sed -e \"/^g /s/.*/g : changed line/\" <A >B &&\n+rm A &&\n+git update-index --add B &&\n+git commit -q -a -m \"changed and renamed\" &&\n+\n git checkout master'\n \n test_expect_success 'merge renaming branch into unrenaming one' \\\n@@ -318,4 +331,14 @@ test_expect_success 'interference with untracked working tree file' '\n \tgit reset --hard anchor\n '\n \n+test_expect_success 'merge of identical changes in a renamed file' '\n+\trm -f A M N\n+\tgit reset --hard &&\n+\tgit checkout change+rename &&\n+\tGIT_MERGE_VERBOSITY=3 git merge change | grep \"^Skipped B\" &&\n+\tgit reset --hard HEAD^ &&\n+\tgit checkout change &&\n+\tGIT_MERGE_VERBOSITY=3 git merge change+rename | grep \"^Skipped B\"\n+'\n+\n test_done\n-- \n1.5.2.rc0.63.gdfc8-dirty\n"}]}