Avoid generating no-op conflicts.

diff --git a/ChangeLog b/ChangeLog
index 437e4a111010f62cdf57aa79df43a665b4029337..386eaf593c3b6c8a3d82d4e4136db855df515467 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-17  Bruno Haible  <bruno@clisp.org>
+
+       * lib/git-merge-changelog.c (main) [split_merged_entry]: Avoid
+       generating no-op conflicts.
+
 2008-02-17  Bruno Haible  <bruno@clisp.org>
 
        Speed up by 10%.

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 56e5511024fa543a7c9941c40e3c0899e9d4499e..1911c08e5ca78b0932e239548651ada0e1bb09ed 100644 (file)
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -1257,7 +1257,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
                                                            result_entries_pointers[k],
                                                            changed_entry);
                                  }
-                               else
+                               else if (!entry_equals (ancestor_file.entries[i],
+                                                       changed_entry))
                                  {
                                    struct conflict *c = XMALLOC (struct conflict);
                                    c->num_old_entries = 1;
@@ -1337,7 +1338,10 @@ There is NO WARRANTY, to the extent permitted by law.\n\
                                  }
                                else
                                  {
-                                   struct conflict *c = XMALLOC (struct conflict);
+                                   struct conflict *c;
+                                   ASSERT (!entry_equals (ancestor_file.entries[i],
+                                                          changed_entry));
+                                   c = XMALLOC (struct conflict);
                                    c->num_old_entries = 1;
                                    c->old_entries =
                                      XNMALLOC (c->num_old_entries, struct entry *);
@@ -1399,7 +1403,10 @@ There is NO WARRANTY, to the extent permitted by law.\n\
                                      }
                                    else
                                      {
-                                       struct conflict *c = XMALLOC (struct conflict);
+                                       struct conflict *c;
+                                       ASSERT (!entry_equals (ancestor_file.entries[i],
+                                                              changed_entry));
+                                       c = XMALLOC (struct conflict);
                                        c->num_old_entries = 1;
                                        c->old_entries =
                                          XNMALLOC (c->num_old_entries, struct entry *);