summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorFinn Arne Gangstad <finnag@pvv.org>2007-12-18 19:50:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-20 00:58:42 (GMT)
commit20b178de7b20a0ebf02b8da3b4791c06fc8e3a63 (patch)
tree7d363898fe9d67392bc45bc8cf79bf54af057a46 /merge-recursive.c
parent5909651ea2be69932d9b739b4441ca857ced7660 (diff)
downloadgit-20b178de7b20a0ebf02b8da3b4791c06fc8e3a63.zip
git-20b178de7b20a0ebf02b8da3b4791c06fc8e3a63.tar.gz
git-20b178de7b20a0ebf02b8da3b4791c06fc8e3a63.tar.bz2
Improved submodule merge support
When merging conflicting submodule changes from a supermodule, generate a conflict message saying what went wrong. Also leave the tree in a state where git status shows the conflict, and git submodule status gives the user enough information to do the merge manally. Previously this would just fail. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 2a58dad..33ccc40 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -549,6 +549,10 @@ static void update_file_flags(const unsigned char *sha,
void *buf;
unsigned long size;
+ if (S_ISGITLINK(mode))
+ die("cannot read object %s '%s': It is a submodule!",
+ sha1_to_hex(sha), path);
+
buf = read_sha1_file(sha, &type, &size);
if (!buf)
die("cannot read object %s '%s'", sha1_to_hex(sha), path);
@@ -1463,10 +1467,13 @@ static int process_entry(const char *path, struct stage_data *entry,
mfi = merge_file(&o, &a, &b,
branch1, branch2);
+ clean_merge = mfi.clean;
if (mfi.clean)
update_file(1, mfi.sha, mfi.mode, path);
+ else if (S_ISGITLINK(mfi.mode))
+ output(1, "CONFLICT (submodule): Merge conflict in %s "
+ "- needs %s", path, sha1_to_hex(b.sha1));
else {
- clean_merge = 0;
output(1, "CONFLICT (%s): Merge conflict in %s",
reason, path);