development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
19313 commits 6 branches 951 tags 697 MiB
Commit graph

3 commits

Author SHA1 Message Date
Junio C Hamano 0c44c94309 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>
 2009-04-29 16:50:21 -07:00
Clemens Buchacher 0eb6574c24 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>
 2009-04-05 00:26:32 -07:00
Clemens Buchacher f37ae35e73 add tests for merging with submodules 
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-04-05 00:26:30 -07:00