Michele Locati <michele@xxxxxxxxx> writes: > Using the --state-branch option allows us to perform incremental filtering. > This may lead to having nothing to rewrite in subsequent filtering, so we need > a way to recognize this case. > So, let's exit with 2 instead of 1 when this "error" occurs. > > Signed-off-by: Michele Locati <michele@xxxxxxxxx> > --- > Documentation/git-filter-branch.txt | 8 ++++++++ > git-filter-branch.sh | 2 +- > 2 files changed, 9 insertions(+), 1 deletion(-) Thanks. Will queue. > > diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt > index 3a52e4dce..b63404318 100644 > --- a/Documentation/git-filter-branch.txt > +++ b/Documentation/git-filter-branch.txt > @@ -222,6 +222,14 @@ this purpose, they are instead rewritten to point at the nearest ancestor that > was not excluded. > > > +EXIT STATUS > +----------- > + > +On success, the exit status is `0`. If the filter can't find any commits to > +rewrite, the exit status is `2`. On any other error, the exit status may be > +any other non-zero value. > + > + > Examples > -------- > > diff --git a/git-filter-branch.sh b/git-filter-branch.sh > index 1b7e4b2cd..c285fdb90 100755 > --- a/git-filter-branch.sh > +++ b/git-filter-branch.sh > @@ -310,7 +310,7 @@ git rev-list --reverse --topo-order --default HEAD \ > die "Could not get the commits" > commits=$(wc -l <../revs | tr -d " ") > > -test $commits -eq 0 && die "Found nothing to rewrite" > +test $commits -eq 0 && die_with_status 2 "Found nothing to rewrite" > > # Rewrite the commits > report_progress ()
