diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-10 11:22:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-11 00:40:56 -0800 |
| commit | ff72af00f86cbbaaab57c886c70f9799715ca02f (patch) | |
| tree | 301c0913f7fc3b8199e7751524305d9e1b04cca7 /git-merge-one-file.sh | |
| parent | 591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d (diff) | |
| download | git-ff72af00f86cbbaaab57c886c70f9799715ca02f.tar.gz | |
Support a merge with conflicting gitlink change
merge-recursive did not support merging trees that have conflicting
changes in submodules they contain, and died. Support it exactly the
same way as how it handles conflicting symbolic link changes --- mark it
as a conflict, take the tentative result from the current side, and
letting the caller resolve the conflict, without dying in merge_file()
function.
Also reword the error message issued when merge_file() has to die
because it sees a tree entry of type it does not support yet.
[jc: fixed up initial draft by Finn Arne Gangstad]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 1e7727d276..9ee3f80452 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -80,6 +80,10 @@ case "${1:-.}${2:-.}${3:-.}" in echo "ERROR: $4: Not merging symbolic link changes." exit 1 ;; + *,160000,*) + echo "ERROR: $4: Not merging conflicting submodule changes." + exit 1 + ;; esac src2=`git-unpack-file $3` |