diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:26:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:53 +0900 |
| commit | 03a7f388dafaee0aa084144efe7a8f9c151e5221 (patch) | |
| tree | e31007a046fd6f661af5df6d6d47cf747401823f /git-rebase--interactive.sh | |
| parent | e1ccd7e2b1cae8d7dab4686cddbd923fb6c46953 (diff) | |
| download | git-03a7f388dafaee0aa084144efe7a8f9c151e5221.tar.gz | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 50323fc273..cc873d630d 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -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" } |