diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-06-06 09:43:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-06 12:49:16 -0700 |
| commit | 2766ce28150597677bb91c424e6033a298c71510 (patch) | |
| tree | 3a9324e53e7a6d2294864bc2f0fa98adeadaa28d /t/t7003-filter-branch.sh | |
| parent | 9840906026be807d0882f96396de3a3cdb9fb43e (diff) | |
| download | git-2766ce28150597677bb91c424e6033a298c71510.tar.gz git-2766ce28150597677bb91c424e6033a298c71510.tar.xz | |
filter-branch: Use rev-list arguments to specify revision ranges.
A subset of commits in a branch used to be specified by options (-k, -r)
as well as the branch tip itself (-s). It is more natural (for git users)
to specify revision ranges like 'master..next' instead. This makes it so.
If no range is specified it defaults to 'HEAD'.
As a consequence, the new name of the filtered branch must be the first
non-option argument. All remaining arguments are passed to 'git rev-list'
unmodified.
The tip of the branch that gets filtered is implied: It is the first
commit that git rev-list would print for the specified range.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7003-filter-branch.sh')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 6e2be5be0..3739cb191 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -47,7 +47,7 @@ test_expect_success 'test that the file was renamed' ' git tag oldD H3~4 test_expect_success 'rewrite one branch, keeping a side branch' ' - git-filter-branch --tree-filter "mv b boh || :" -k D -s oldD modD + git-filter-branch --tree-filter "mv b boh || :" modD D..oldD ' test_expect_success 'common ancestor is still common (unchanged)' ' |