merge-one-file: compute empty blob object ID · freshlybakedca.ke/git@7882fa2

Git fork

merge-one-file: compute empty blob object ID

This script hard-codes the object ID of the empty blob. To avoid any
problems when changing hashes, compute this value by calling git
hash-object.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

brian m. carlson and committed by

Junio C Hamano 8 years ago 7882fa22 23ec4c51

+1 -1

1 changed file

expand all

git-merge-one-file.sh

+1 -1

git-merge-one-file.sh

··· 120 120 case "$1" in 121 121 '') 122 122 echo "Added $4 in both, but differently." 123 - orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391) 123 + orig=$(git unpack-file $(git hash-object /dev/null)) 124 124 ;; 125 125 *) 126 126 echo "Auto-merging $4"