summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@datawire.io>2021-04-27 21:17:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-28 07:47:18 (GMT)
commitbbffb023830f9b68e2c461e47756579a5cd6ab7a (patch)
tree6e47c54ae9de0248f3d35d87810d2caac968c8ea /contrib/subtree/git-subtree.sh
parent22d550749361ff2a480bc4263ae21919368851ed (diff)
downloadgit-bbffb023830f9b68e2c461e47756579a5cd6ab7a.zip
git-bbffb023830f9b68e2c461e47756579a5cd6ab7a.tar.gz
git-bbffb023830f9b68e2c461e47756579a5cd6ab7a.tar.bz2
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>
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index af636fb..ee7fda3 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)