X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=merge-recursive.c;h=780f81a8bd3a729502cf2211a63135e4fba5d6cf;hb=e6932248fcb41fb94a0be484050881e03c7eb298;hp=2ecf495cc2a4a6d4544b92db1d2a8c3c0cc36f87;hpb=e87f9fc9d4ead0ec7f98c9493a9f2ad8c41cd6ee;p=git-core%2Fgit.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 2ecf495cc..780f81a8b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1952,6 +1952,13 @@ int merge_trees(struct merge_options *o,
 	}
 
 	if (oid_eq(&common->object.oid, &merge->object.oid)) {
+		struct strbuf sb = STRBUF_INIT;
+
+		if (index_has_changes(&sb)) {
+			err(o, _("Dirty index: cannot merge (dirty: %s)"),
+			    sb.buf);
+			return 0;
+		}
 		output(o, 0, _("Already up to date!"));
 		*result = head;
 		return 1;