[PATCH 02/37] merge-recursive: Restructure showing how to chain more process_* functions

From

Elijah Newren <newren@gmail.com>

Date

Sep 20, 2010, 08:28 UTC

Message-ID

<1284971350-30590-3-git-send-email-newren@gmail.com>

In-Reply-To

<1284971350-30590-1-git-send-email-newren@gmail.com>

From: Junio C Hamano <gitster@pobox.com>

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-recursive.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index bf611ae..4d9c165 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1260,9 +1260,8 @@ static int process_df_entry(struct merge_options *o,
 	const char *conf;
 	struct stat st;
 
-	/* We currently only handle D->F cases */
-	assert((!o_sha && a_sha && !b_sha) ||
-	       (!o_sha && !a_sha && b_sha));
+	if (! ((!o_sha && a_sha && !b_sha) || (!o_sha && !a_sha && b_sha)))
+		return 1; /* we don't handle non D-F cases */
 
 	entry->processed = 1;
 
@@ -1351,6 +1350,12 @@ int merge_trees(struct merge_options *o,
 				&& !process_df_entry(o, path, e))
 				clean = 0;
 		}
+		for (i = 0; i < entries->nr; i++) {
+			struct stage_data *e = entries->items[i].util;
+			if (!e->processed)
+				die("Unprocessed path??? %s",
+				    entries->items[i].string);
+		}
 
 		string_list_clear(re_merge, 0);
 		string_list_clear(re_head, 0);

-- 
1.7.3.271.g16009