[PATCH 1/2] git-subtree: make sure the SHA saved as ancestor is a commit
From: Jérémy Rosen <hidden>
Date: 2016-06-15 22:56:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
When adding or merging the first parameter might not be a commit, it can also be a tag SHA. This needs to be fixed by using the underlying commit or the ancestor finding code will croak at split time Signed-off-by: Jérémy Rosen <redacted> --- contrib/subtree/git-subtree.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 8a23f58..8b9d114 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh@@ -531,7 +531,7 @@ cmd_add_repository() cmd_add_commit() { - revs=$(git rev-parse $default --revs-only "$@") || exit $? + revs=$(git rev-parse $default --revs-only "$1^{commit}") || exit $? set -- $revs rev="$1"
@@ -655,7 +655,7 @@ cmd_split() cmd_merge() { - revs=$(git rev-parse $default --revs-only "$@") || exit $? + revs=$(git rev-parse $default --revs-only "$1^{commit}") || exit $? ensure_clean set -- $revs
--
1.7.10.4