Re: [PATCH] git-filter-branch: Add more error-handling
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:46:09
Eric Kidd schrieb:
In particular, the following hunk may change the public UI to git-filter-branch, although I'm not sure whether the change is for better or for worse. As I understand it, this hunk would allow $filter_commit to abort the rewriting process by returning a non-0 exit status: @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ - $(git write-tree) $parentstr < ../message > ../map/$commit + $(git write-tree) $parentstr < ../message > ../map/$commit || + die "could not write rewritten commit" done <../revs I'd be happy to add a test case for what happens when $filter_commit returns a non-0 exit status. Is the old behavior preferable?
I think it's OK to die if the commit filter fails. But generally, I think it is not necessary to use 'die with error message', a plain '|| exit' should be enough because an error will have been reported already by the tool that failed.
quoted hunk ↗ jump to hunk
@@ -483,7 +486,7 @@ test -z "$ORIG_GIT_INDEX_FILE" || { } if [ "$(is_bare_repository)" = false ]; then - git read-tree -u -m HEAD + git read-tree -u -m HEAD || die "Unable to checkout rewritten tree"
Here you shouldn't die. But unlike elsewhere, this case warrants an explanation for the user: git read-tree -u -m HEAD || echo >&2 "WARNING: The working directory is not up-to-date!"
fi exit $ret
-- Hannes