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>
brian m. carlson committed
May 2, 2018 at 00:26 UTC
7882fa220c1f86e3f9707270e2e94d54149394ed
1 file changed
+1
-1
git-merge-one-file.sh
+1
-1
@@ -120,7 +120,7 @@ case "${1:-.}${2:-.}${3:-.}" in
120
case "$1" in
121
'')
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
;;
125
*)
126
echo "Auto-merging $4"