mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-24 19:05:19 +02:00
Code

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>
This commit is contained in:
brian m. carlson 2018-05-02 00:26:10 +00:00 committed by Junio C Hamano
parent 23ec4c51d5
commit 7882fa220c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-one-file.sh
View File

@ -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"