THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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>
tags/v2.18.0-rc0
brian m. carlson Junio C Hamano 1 year ago
parent
commit
7882fa220c
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      git-merge-one-file.sh

+ 1
- 1
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"


Loading…
Cancel
Save