mirror of
https://github.com/git/git.git
synced 2024-11-15 16:03:16 +01:00
160252f816
git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
15 lines
356 B
Bash
Executable File
15 lines
356 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
# Pretend we resolved the heads, but declare our tree trumps everybody else.
|
|
#
|
|
|
|
# We need to exit with 2 if the index does not match our HEAD tree,
|
|
# because the current index is what we will be committing as the
|
|
# merge result.
|
|
|
|
test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
|
|
|
|
exit 0
|