From: Roger Strain Date: Fri, 12 Oct 2018 13:52:18 +0000 (-0500) Subject: subtree: performance improvement for finding unexpected parent commits X-Git-Tag: v2.20.0-rc0~146^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/19ad68d95d6f8104eca1e86f8d1dfae50c7fb268 subtree: performance improvement for finding unexpected parent commits After testing a previous patch at larger scale, a performance issue was detected when using git show to locate parent revisions, with a single run of the git show command taking 2 seconds or longer in a complex repo. When the command is required tens or hundreds of times in a run of the script, the additional wait time is unaccepatable. Replacing the command with git rev-parse resulted in significantly increased performance, with the command in question returning instantly. Signed-off-by: Roger Strain Signed-off-by: Junio C Hamano --- diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 1c157dbd95..147201dc6c 100755 --- 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