diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-29 11:08:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 16:50:21 -0700 |
| commit | 0c44c94309693d0582e91a6744edc2e8eba46ef8 (patch) | |
| tree | 478bfc7cd76c4c9432018ddc686eb121eb418c96 /merge-recursive.c | |
| parent | d212ca1724b1a3708a3b4cb72c58b20ef442b24f (diff) | |
| download | git-0c44c94309693d0582e91a6744edc2e8eba46ef8.tar.gz git-0c44c94309693d0582e91a6744edc2e8eba46ef8.tar.xz | |
merge-recursive: do not die on a conflicting submodule
We cannot represent the 3-way conflicted state in the work tree
for these entries, but it is normal not to have commit objects
for them in our repository. Just update the index and the life
will be good.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d6f058223..a3721efca 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -520,8 +520,12 @@ static void update_file_flags(struct merge_options *o, unsigned long size; if (S_ISGITLINK(mode)) - die("cannot read object %s '%s': It is a submodule!", - sha1_to_hex(sha), path); + /* + * We may later decide to recursively descend into + * the submodule directory and update its index + * and/or work tree, but we do not do that now. + */ + goto update_index; buf = read_sha1_file(sha, &type, &size); if (!buf) |