summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:32:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:32:21 (GMT)
commit7173ad76edfb016500cc7a97f35b067964085ac8 (patch)
treea5587df7cf3ca92d793a6e32bba63d27674bc1e2 /contrib/subtree/git-subtree.sh
parentc8704ad33534b40e14c412f36f83f64cfcbf0359 (diff)
parent6f1871fe0f7d9bddfbe199cceeb255cf8edbaab3 (diff)
downloadgit-7173ad76edfb016500cc7a97f35b067964085ac8.zip
git-7173ad76edfb016500cc7a97f35b067964085ac8.tar.gz
git-7173ad76edfb016500cc7a97f35b067964085ac8.tar.bz2
Merge branch 'jd/subtree'
* jd/subtree: contrib/subtree: allow adding an annotated tag contrib/subtree/Makefile: clean up rule for "clean" contrib/subtree/Makefile: clean up rules to generate documentation contrib/subtree/Makefile: s/libexecdir/gitexecdir/ contrib/subtree/Makefile: use GIT-VERSION-FILE contrib/subtree/Makefile: scrap unused $(gitdir)
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index db925ca..fa1a583 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -558,8 +558,9 @@ cmd_add_commit()
commit=$(add_squashed_msg "$rev" "$dir" |
git commit-tree $tree $headp -p "$rev") || exit $?
else
+ revp=$(peel_committish "$rev") &&
commit=$(add_msg "$dir" "$headrev" "$rev" |
- git commit-tree $tree $headp -p "$rev") || exit $?
+ git commit-tree $tree $headp -p "$revp") || exit $?
fi
git reset "$commit" || exit $?