user/sven/git.git/git-filter-branch.sh, branch v1.8.0.2

Merge branch 'jc/maint-filter-branch-epoch-date'

2012-07-22T19:55:05Z

In 1.7.9 era, we taught "git rebase" about the raw timestamp format but we did not teach the same trick to "filter-branch", which rolled a similar logic on its own. Because of this, "filter-branch" failed to rewrite commits with ancient timestamps. * jc/maint-filter-branch-epoch-date: t7003: add test to filter a branch with a commit at epoch date.c: Fix off by one error in object-header date parsing filter-branch: do not forget the '@' prefix to force git-timestamp

filter-branch: do not forget the '@' prefix to force git-timestamp

2012-07-10T03:42:54Z

For some reason, this script reinvents, instead of refactoring the existing one in git-sh-setup, the logic to grab ident information from an existing commit; it was missed when the corresponding logic in git-sh-setup was updated with 2c733fb (parse_date(): '@' prefix forces git-timestamp, 2012-02-02). Teach the script that it is OK to have a way ancient timestamp in the commits that are being filtered. Signed-off-by: Junio C Hamano

Merge branch 'jk/filter-branch-require-clean-work-tree'

2011-10-05T19:35:55Z

* jk/filter-branch-require-clean-work-tree: filter-branch: use require_clean_work_tree

filter-branch: use require_clean_work_tree

2011-09-15T23:58:55Z

Filter-branch already requires that we have a clean work tree before starting. However, it failed to refresh the index before checking, which means it could be wrong in the case of stat-dirtiness. Instead of simply adding a call to refresh the index, let's switch to using the require_clean_work_tree function provided by git-sh-setup. It does exactly what we want, and with fewer lines of code and more specific output messages. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'js/sh-style'

2011-08-18T00:35:50Z

* js/sh-style: filter-branch.sh: de-dent usage string misc-sh: fix up whitespace in some other .sh files.

filter-branch: Export variable `workdir' for --commit-filter

2011-08-08T19:09:38Z

According to `git help filter-branch': --commit-filter ... You can use the _map_ convenience function in this filter, and other convenience functions, too... ... However, it turns out that `map' hasn't been usable because it depends on the variable `workdir', which is not propogated to the environment of the shell that runs the commit-filter because the shell is created via a simple-command rather than a compound-command subshell: @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" One solution is simply to export `workdir'. However, it seems rather heavy-handed to export `workdir' to the environments of all commands, so instead this commit exports `workdir' for only the duration of the shell command in question: workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano

filter-branch.sh: de-dent usage string

2011-08-05T22:06:21Z

"Usage: git filter-branch " that is prefixed to the first line is 25 columns long, so the "[--index-filter ..." on the second line would not align with "[--env-filter ..." on the first line to begin with. If the second and subsequent lines do not aim to align with anything on the first line, it is just fine to indent them with a single HT. Signed-off-by: Junio C Hamano

misc-sh: fix up whitespace in some other .sh files.

2011-08-05T22:04:48Z

I found that the patched 4 files were different when this filter is applied. expand -i | unexpand --first-only This patch contains the corrected files. Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

filter-branch: retire --remap-to-ancestor

2010-08-27T23:47:01Z

We can be clever and know by ourselves when we need the behavior implied by "--remap-to-ancestor". No need to encumber users by having them exposed to it as a tunable. (Option kept for backward compatibility, but it's now a no-op.) Signed-off-by: Csaba Henk Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-02-12T07:06:32Z

* maint: filter-branch: Fix error message for --prune-empty --commit-filter