summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-04-25 20:07:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-26 06:43:16 (GMT)
commit8a359819273a4460d5806d2d5e76cd7993a84843 (patch)
tree2744717ade03e7d2958a26b0fb070c706f079ecd /merge-recursive.c
parentc135ee88f8584996ead993c76015d2c03798ab9e (diff)
downloadgit-8a359819273a4460d5806d2d5e76cd7993a84843.zip
git-8a359819273a4460d5806d2d5e76cd7993a84843.tar.gz
git-8a359819273a4460d5806d2d5e76cd7993a84843.tar.bz2
Add a test for merging changed and rename-changed branches
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 37f1ba9..094ac59 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1345,6 +1345,11 @@ static int process_renames(struct path_list *a_renames,
if (mfi.merge && mfi.clean &&
sha_eq(mfi.sha, ren1->pair->two->sha1) &&
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);
else {
if (mfi.merge || !mfi.clean)