X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgit-merge-changelog.c;h=524d5d34939242a658fbd989ce57cb05de2fdb03;hb=952be23bc009785c91c76e8dbb29c73001e3267a;hp=5f639eff0d8a54ae474ad58b4d01a9dbf6f84f0f;hpb=65bd10479d4cb86bab4aea1424c094f8f585000c;p=gnulib.git

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 5f639eff0..524d5d349 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -186,7 +186,7 @@ entry_equals (const void *elt1, const void *elt2)
   const struct entry *entry2 = (const struct entry *) elt2;
   return entry1->length == entry2->length
 	 && memcmp (entry1->string, entry2->string, entry1->length) == 0;
-};
+}
 
 /* Return a hash code of the contents of a ChangeLog entry.  */
 static size_t
@@ -808,7 +808,7 @@ conflict_write (FILE *fp, struct conflict *c)
 
 /* Long options.  */
 static const struct option long_options[] =
-{ 
+{
   { "help", no_argument, NULL, 'h' },
   { "split-merged-entry", no_argument, NULL, CHAR_MAX + 1 },
   { "version", no_argument, NULL, 'V' },
@@ -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 *);
@@ -1505,11 +1512,14 @@ There is NO WARRANTY, to the extent permitted by law.\n\
 	for (i = 0; i < n; i++)
 	  conflict_write (fp, (struct conflict *) gl_list_get_at (result_conflicts, i));
       }
+      /* Output the modified and unmodified entries, in order.  */
       {
-	size_t n = gl_list_size (result_entries);
-	size_t i;
-	for (i = 0; i < n; i++)
-	  entry_write (fp, (struct entry *) gl_list_get_at (result_entries, i));
+	gl_list_iterator_t iter = gl_list_iterator (result_entries);
+	const void *elt;
+	gl_list_node_t node;
+	while (gl_list_iterator_next (&iter, &elt, &node))
+	  entry_write (fp, (struct entry *) elt);
+	gl_list_iterator_free (&iter);
       }
 
       if (fwriteerror (fp))