Merge branch 'mg/gpg-parse-tighten'

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 1c157dbd95f49a2514eb311cd549dbbab6f8b4b3..147201dc6c5786c9cfedbbbff0df0b1dced171db 100755 (executable)
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -633,7 +633,7 @@ process_split_commit () {
        else
                # processing commit without normal parent information;
                # fetch from repo
-               parents=$(git show -s --pretty=%P "$rev")
+               parents=$(git rev-parse "$rev^@")
                extracount=$(($extracount + 1))
        fi