summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-09-15 17:39:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-15 23:34:11 (GMT)
commit023756f4eb71bfa37e17b0bdbf4b9fcbbba95466 (patch)
tree8e36fe2a13d5c5a1ea473eb274d834ffd50fe983 /revision.c
parente598c5177e439271e8bd81ef2a689a3ab0db80e6 (diff)
downloadgit-023756f4eb71bfa37e17b0bdbf4b9fcbbba95466.zip
git-023756f4eb71bfa37e17b0bdbf4b9fcbbba95466.tar.gz
git-023756f4eb71bfa37e17b0bdbf4b9fcbbba95466.tar.bz2
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>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index c193c3e..33d092c 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")) {