From: Johannes Sixt Date: Wed, 04 Jul 2007 12:08:17 GMT Subject: [PATCH take 2] filter-branch: Avoid an error message in the map function. Message-ID: <468B8DB1.9A4CF1E6@eudaptics.com> In-Reply-To: When the map function didn't find the rewritten commit of the passed in original id, it printed the original id, but it still fell through to the 'cat', which failed with an error message. Signed-off-by: Johannes Sixt --- git-filter-branch.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 22fb5bf..5fa9b61 100644 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -16,8 +16,12 @@ map() { # if it was not rewritten, take the original - test -r "$workdir/../map/$1" || echo "$1" - cat "$workdir/../map/$1" + if test -r "$workdir/../map/$1" + then + cat "$workdir/../map/$1" + else + echo "$1" + fi } # When piped a commit, output a script to set the ident of either -- 1.5.3.rc0.5.g7cd9