From: Luke Shumaker <lukeshu@datawire.io>
Date: Tue, 27 Apr 2021 21:17:38 +0000 (-0600)
Subject: subtree: use "^{commit}" instead of "^0"
X-Git-Tag: v2.32.0-rc0~30^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbffb023830f9b68e2c461e47756579a5cd6ab7a;p=thirdparty%2Fgit.git

subtree: use "^{commit}" instead of "^0"

They are synonyms.  Both are used in the file.  ^{commit} is clearer, so
"standardize" on that.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index af636fbb43..ee7fda3672 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -316,7 +316,7 @@ find_latest_squash () {
 			main="$b"
 			;;
 		git-subtree-split:)
-			sub="$(git rev-parse "$b^0")" ||
+			sub="$(git rev-parse "$b^{commit}")" ||
 			die "could not rev-parse split hash $b from commit $sq"
 			;;
 		END)
@@ -363,7 +363,7 @@ find_existing_splits () {
 			main="$b"
 			;;
 		git-subtree-split:)
-			sub="$(git rev-parse "$b^0")" ||
+			sub="$(git rev-parse "$b^{commit}")" ||
 			die "could not rev-parse split hash $b from commit $sq"
 			;;
 		END)