From 0eb6574c24241b1e54be1ddff60287544faaf8d8 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sun, 5 Apr 2009 02:46:59 +0200 Subject: update cache for conflicting submodule entries When merging merge bases during a recursive merge we do not want to leave any unmerged entries. Otherwise we cannot create a temporary tree for the recursive merge to work with. We failed to do so in case of a submodule conflict between merge bases, causing a NULL pointer dereference in the next step of the recursive merge. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- merge-recursive.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index ee853b990d..3618c94bd2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1123,10 +1123,11 @@ static int process_entry(struct merge_options *o, clean_merge = mfi.clean; if (mfi.clean) update_file(o, 1, mfi.sha, mfi.mode, path); - else if (S_ISGITLINK(mfi.mode)) + else if (S_ISGITLINK(mfi.mode)) { output(o, 1, "CONFLICT (submodule): Merge conflict in %s " "- needs %s", path, sha1_to_hex(b.sha1)); - else { + update_file(o, 0, mfi.sha, mfi.mode, path); + } else { output(o, 1, "CONFLICT (%s): Merge conflict in %s", reason, path); -- cgit v1.2.3 From 39d8e271f42e976a61f08a4f7bc2047a682ac532 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sun, 5 Apr 2009 02:47:00 +0200 Subject: simplify output of conflicting merge This simplifies the code without changing the semantics and removes the unhelpful "needs $sha1" part of the conflicting submodule message. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- merge-recursive.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 3618c94bd2..9bf5cc7175 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1121,22 +1121,13 @@ static int process_entry(struct merge_options *o, o->branch1, o->branch2); clean_merge = mfi.clean; - if (mfi.clean) - update_file(o, 1, mfi.sha, mfi.mode, path); - else if (S_ISGITLINK(mfi.mode)) { - output(o, 1, "CONFLICT (submodule): Merge conflict in %s " - "- needs %s", path, sha1_to_hex(b.sha1)); - update_file(o, 0, mfi.sha, mfi.mode, path); - } else { + if (!mfi.clean) { + if (S_ISGITLINK(mfi.mode)) + reason = "submodule"; output(o, 1, "CONFLICT (%s): Merge conflict in %s", reason, path); - - if (o->call_depth) - update_file(o, 0, mfi.sha, mfi.mode, path); - else - update_file_flags(o, mfi.sha, mfi.mode, path, - 0 /* update_cache */, 1 /* update_working_directory */); } + update_file(o, mfi.clean, mfi.sha, mfi.mode, path); } else if (!o_sha && !a_sha && !b_sha) { /* * this entry was deleted altogether. a_mode == 0 means -- cgit v1.2.3