[PATCH 2/2] filter-branch: use git-sh-setup's ident parsing functions
- From
Jeff King <peff@peff.net>
- Date
- Oct 18, 2012, 07:25 UTC
- Message-ID
- <20121018072535.GB9999@sigill.intra.peff.net>
- In-Reply-To
- <20121018072207.GA1605@sigill.intra.peff.net>
This saves us some code, but it also reduces the number of processes we start for each filtered commit. Since we can parse both author and committer in the same sed invocation, we save one process. And since the new interface avoids tr, we save 4 processes.
It also avoids using "tr", which has had some odd portability problems reported with from Solaris's xpg6 version.
Signed-off-by: Jeff King <peff@peff.net> --- git-filter-branch.sh | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 178e453..69406ae 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -64,37 +64,15 @@ set_ident () { eval "$functions" -# When piped a commit, output a script to set the ident of either -# "author" or "committer +# Ensure non-empty id name. +fallback_name() { + echo "case \"\$GIT_$1_NAME\" in \"\") GIT_$1_NAME=\"\${GIT_$1_EMAIL%%@*}\" && export GIT_$1_NAME;; esac" +} set_ident () { - lid="$(echo "$1" | tr "[A-Z]" "[a-z]")" - uid="$(echo "$1" | tr "[a-z]" "[A-Z]")" - pick_id_script=' - /^'$lid' /{ - s/'\''/'\''\\'\'\''/g - h - s/^'$lid' \([^<]*\) <[^>]*> .*$/\1/ - s/'\''/'\''\'\'\''/g - s/.*/GIT_'$uid'_NAME='\''&'\''; export GIT_'$uid'_NAME/p - - g - s/^'$lid' [^<]* <\([^>]*\)> .*$/\1/ - s/'\''/'\''\'\'\''/g - s/.*/GIT_'$uid'_EMAIL='\''&'\''; export GIT_'$uid'_EMAIL/p - - g - s/^'$lid' [^<]* <[^>]*> \(.*\)$/@\1/ - s/'\''/'\''\'\'\''/g - s/.*/GIT_'$uid'_DATE='\''&'\''; export GIT_'$uid'_DATE/p - - q - } - ' - - LANG=C LC_ALL=C sed -ne "$pick_id_script" - # Ensure non-empty id name. - echo "case \"\$GIT_${uid}_NAME\" in \"\") GIT_${uid}_NAME=\"\${GIT_${uid}_EMAIL%%@*}\" && export GIT_${uid}_NAME;; esac" + parse_ident_from_commit author AUTHOR committer COMMITTER + fallback_name AUTHOR + fallback_name COMMITTER } USAGE="[--env-filter <command>] [--tree-filter <command>] @@ -320,10 +298,8 @@ while read commit parents; do git cat-file commit "$commit" >../commit || die "Cannot read commit $commit" - eval "$(set_ident AUTHOR <../commit)" || - die "setting author failed for commit $commit" - eval "$(set_ident COMMITTER <../commit)" || - die "setting committer failed for commit $commit" + eval "$(set_ident <../commit)" || + die "setting author/committer failed for commit $commit" eval "$filter_env" < /dev/null || die "env filter failed: $filter_env"
-- 1.8.0.rc3.3.gba630e1