> This script hard-codes the object ID of the empty tree. To avoid any
s/tree/blob/
> problems when changing hashes, compute this value by calling git
> hash-object.
Missing signoff.
> ---
> git-merge-one-file.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
> index 9879c59395..f6d9852d2f 100755
> --- a/git-merge-one-file.sh
> +++ b/git-merge-one-file.sh
> @@ -120,7 +120,7 @@ case "${1:-.}${2:-.}${3:-.}" in
> case "$1" in
> '')
> echo "Added $4 in both, but differently."
> - orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
> + orig=$(git unpack-file $(git hash-object /dev/null))
> ;;
> *)
> echo "Auto-merging $4"
>
