diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-09-15 18:39:52 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-15 16:34:11 -0700 |
| commit | 023756f4eb71bfa37e17b0bdbf4b9fcbbba95466 (patch) | |
| tree | 8e36fe2a13d5c5a1ea473eb274d834ffd50fe983 | |
| parent | e598c5177e439271e8bd81ef2a689a3ab0db80e6 (diff) | |
| download | git-023756f4eb71bfa37e17b0bdbf4b9fcbbba95466.tar.gz git-023756f4eb71bfa37e17b0bdbf4b9fcbbba95466.tar.xz | |
revision walker: --cherry-pick is a limited operation
We used to rely on the fact that cherry-pick would trigger the code path
to set limited = 1 in handle_commit(), when an uninteresting commit was
encountered.
However, when cherry picking between two independent branches, i.e. when
there are no merge bases, and there is only linear development (which can
happen when you cvsimport a fork of a project), no uninteresting commit
will be encountered.
So set limited = 1 when --cherry-pick was asked for.
Noticed by Martin Bähr.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 1 | ||||
| -rwxr-xr-x | t/t6007-rev-list-cherry-pick-file.sh | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/revision.c b/revision.c index c193c3ea2..33d092c3c 100644 --- a/revision.c +++ b/revision.c @@ -1024,6 +1024,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (!strcmp(arg, "--cherry-pick")) { revs->cherry_pick = 1; + revs->limited = 1; continue; } if (!strcmp(arg, "--objects")) { diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh index 3faeae6c0..4b8611ce2 100755 --- a/t/t6007-rev-list-cherry-pick-file.sh +++ b/t/t6007-rev-list-cherry-pick-file.sh @@ -40,4 +40,18 @@ test_expect_success '--cherry-pick bar does not come up empty' ' ! test -z "$(git rev-list --left-right --cherry-pick B...C -- bar)" ' +test_expect_success '--cherry-pick with independent, but identical branches' ' + git symbolic-ref HEAD refs/heads/independent && + rm .git/index && + echo Hallo > foo && + git add foo && + test_tick && + git commit -m "independent" && + echo Bello > foo && + test_tick && + git commit -m "independent, too" foo && + test -z "$(git rev-list --left-right --cherry-pick \ + HEAD...master -- foo)" +' + test_done |