Update shell scripts to compute empty tree object ID
Several of our shell scripts hard-code the object ID of the empty tree. To avoid any problems when changing hashes, compute this value on startup of the script. For performance, store the value in a variable and reuse it throughout the life of the script. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
e1ccd7e2b1
commit
03a7f388da
@ -81,6 +81,8 @@ rewritten_pending="$state_dir"/rewritten-pending
|
||||
# and leaves CR at the end instead.
|
||||
cr=$(printf "\015")
|
||||
|
||||
empty_tree=$(git hash-object -t tree /dev/null)
|
||||
|
||||
strategy_args=${strategy:+--strategy=$strategy}
|
||||
test -n "$strategy_opts" &&
|
||||
eval '
|
||||
@ -238,7 +240,7 @@ is_empty_commit() {
|
||||
die "$(eval_gettext "\$sha1: not a commit that can be picked")"
|
||||
}
|
||||
ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
|
||||
ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
||||
ptree=$empty_tree
|
||||
test "$tree" = "$ptree"
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user