[PATCH v2] filter-branch: also don't fail in map() if a commit cannot be mapped
- From
Johannes Sixt <johannes.sixt@telecom.at>
- Date
- Jun 6, 2007, 18:38 UTC
- Message-ID
- <200706062038.36093.johannes.sixt@telecom.at>
- In-Reply-To
- <Pine.LNX.4.64.0706061850220.4046@racer.site>
The map() function can be used by filters to map a commit id to its rewritten id. Such a mapping may not exist, in which case the identity mapping is used (the commit is returned unchanged).
In the rewrite loop, this mapping is also needed, but was done explicitly in the same way. Use the map() function instead.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> --- On Wednesday 06 June 2007 19:50, Johannes Schindelin wrote:
Show 6 quoted lines
> On Wed, 6 Jun 2007, Johannes Sixt wrote: > > - [ -r "$workdir/../map/$1" ] || return 1 > > + # if it was not rewritten, take the original > > + [ -r "$workdir/../map/$1" ] || echo "$1" > > Maybe "test" instead of "["? Otherwise, ACK from me.
Right!
git-filter-branch.sh | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index fbbb044..15e9b46 100644 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -189,7 +189,8 @@ USAGE="git-filter-branch [-d TEMPDIR] [-r STARTREV]... [-k KEEPREV]... [-s SRCBR map() { - [ -r "$workdir/../map/$1" ] || return 1 + # if it was not rewritten, take the original + test -r "$workdir/../map/$1" || echo "$1" cat "$workdir/../map/$1" } @@ -362,14 +363,9 @@ while read commit; do parentstr= for parent in $(get_parents $commit); do - if [ -r "../map/$parent" ]; then - for reparent in $(cat "../map/$parent"); do - parentstr="$parentstr -p $reparent" - done - else - # if it was not rewritten, take the original - parentstr="$parentstr -p $parent" - fi + for reparent in $(map "$parent"); do + parentstr="$parentstr -p $reparent" + done done if [ "$filter_parent" ]; then parentstr="$(echo "$parentstr" | eval "$filter_parent")"
-- 1.5.2