summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2009-04-05 02:46:59 +0200
committerJunio C Hamano <gitster@pobox.com>2009-04-05 00:26:32 -0700
commit0eb6574c24241b1e54be1ddff60287544faaf8d8 (patch)
tree79aa4a89f881e93d25c3d7a82efd719e97854388 /merge-recursive.c
parentf37ae35e73dbc492bd3ca24badb309817ecaaa67 (diff)
downloadgit-0eb6574c24241b1e54be1ddff60287544faaf8d8.tar.gz
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 <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c5
1 files changed, 3 insertions, 2 deletions
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);