git/git-filter-branch.sh, branch v2.21.3

Merge branch 'mb/filter-branch-optim'

2018-07-18T19:20:32Z

"git filter-branch" when used with the "--state-branch" option still attempted to rewrite the commits whose filtered result is known from the previous attempt (which is recorded on the state branch); the command has been corrected not to waste cycles doing so. * mb/filter-branch-optim: filter-branch: skip commits present on --state-branch

filter-branch: skip commits present on --state-branch

2018-06-26T22:44:53Z

The commits in state:filter.map have already been processed, so don't filter them again. This makes incremental git filter-branch much faster. Also add tests for --state-branch option. Signed-off-by: Michael Barabanov Acked-by: Ian Campbell Signed-off-by: Junio C Hamano

Update shell scripts to compute empty tree object ID

2018-05-02T04:59:53Z

Several of our shell scripts hard-code the object ID of the empty tree. To avoid any problems when changing hashes, compute this value on startup of the script. For performance, store the value in a variable and reuse it throughout the life of the script. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'yk/filter-branch-non-committish-refs'

2018-04-10T07:28:23Z

when refs that do not point at committish are given, "git filter-branch" gave a misleading error messages. This has been corrected. * yk/filter-branch-non-committish-refs: filter-branch: fix errors caused by refs that point at non-committish

Merge branch 'ml/filter-branch-no-op-error'

2018-04-09T23:25:44Z

"git filter-branch" learned to use a different exit code to allow the callers to tell the case where there was no new commits to rewrite from other error cases. * ml/filter-branch-no-op-error: filter-branch: return 2 when nothing to rewrite

filter-branch: fix errors caused by refs that point at non-committish

2018-03-25T17:12:27Z

"git filter-branch -- --all" prints error messages when processing refs that point at objects that are not committish. Such refs can be created by "git replace" with trees or blobs. And also "git tag" with trees or blobs can create such refs. Filter these problematic refs out early, before they are seen by the logic to see which refs have been modified and which have been left intact (which is where the unwanted error messages come from), and warn that these refs are left unwritten while doing so. Signed-off-by: Yuki Kokubun Signed-off-by: Junio C Hamano

filter-branch: use printf instead of echo -e

2018-03-19T17:59:28Z

In order to echo a tab character, it's better to use printf instead of "echo -e", because it's more portable (for instance, "echo -e" doesn't work as expected on a Mac). This solves the "fatal: Not a valid object name" error in git-filter-branch when using the --state-branch option. Furthermore, let's switch from "/bin/echo" to just "echo", so that the built-in echo command is used where available. Signed-off-by: Michele Locati Signed-off-by: Junio C Hamano

filter-branch: return 2 when nothing to rewrite

2018-03-15T17:41:51Z

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 Signed-off-by: Junio C Hamano

Merge branch 'dg/filter-branch-filter-order-doc'

2017-10-19T05:45:45Z

Update the documentation for "git filter-branch" so that the filter options are listed in the same order as they are applied, as described in an earlier part of the doc. * dg/filter-branch-filter-order-doc: doc: list filter-branch subdirectory-filter first

doc: list filter-branch subdirectory-filter first

2017-10-18T00:10:15Z

The docs claim that filters are applied in the listed order, so subdirectory-filter should come first. For consistency, apply the same order to the SYNOPSIS and the script's usage, as well as the switch while parsing arguments. Add missing --prune-empty to the script's usage. Signed-off-by: David Glasser Signed-off-by: Junio C Hamano