summaryrefslogtreecommitdiff
path: root/git-archimport.perl
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-02-28 23:07:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 09:45:50 (GMT)
commit765ac8ec469f110e88376e4fac05d0ed475bcb28 (patch)
tree151dd9135fb335aeffc4b0e4406c8c4cf8b27e2c /git-archimport.perl
parent70b006b9712b57741ec1320b15aef2f8b1d6a905 (diff)
downloadgit-765ac8ec469f110e88376e4fac05d0ed475bcb28.zip
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.gz
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.bz2
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of the other ones) that makes git log <filename> actually work, as far as I can tell. I didn't add the logic for --before/--after flags, but that should be pretty trivial, and is independent of this anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-archimport.perl')
-rwxr-xr-xgit-archimport.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-archimport.perl b/git-archimport.perl
index 6792624..740bc1f 100755
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -928,7 +928,7 @@ sub find_parents {
# now walk up to the mergepoint collecting what patches we have
my $branchtip = git_rev_parse($ps->{branch});
- my @ancestors = `git-rev-list --merge-order $branchtip ^$mergebase`;
+ my @ancestors = `git-rev-list --topo-order $branchtip ^$mergebase`;
my %have; # collected merges this branch has
foreach my $merge (@{$ps->{merges}}) {
$have{$merge} = 1;
@@ -951,7 +951,7 @@ sub find_parents {
# see what the remote branch has - these are the merges we
# will want to have in a consecutive series from the mergebase
my $otherbranchtip = git_rev_parse($branch);
- my @needraw = `git-rev-list --merge-order $otherbranchtip ^$mergebase`;
+ my @needraw = `git-rev-list --topo-order $otherbranchtip ^$mergebase`;
my @need;
foreach my $needps (@needraw) { # get the psets
$needps = commitid2pset($needps);