diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:26:10 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:53 +0900 |
| commit | 7882fa220c1f86e3f9707270e2e94d54149394ed (patch) | |
| tree | 62db093267fb23bf9d5178880123a90480b97553 | |
| parent | add--interactive: compute the empty tree value (diff) | |
| download | tgif-7882fa220c1f86e3f9707270e2e94d54149394ed.tar.xz | |
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>
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |