diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2007-09-08 16:33:08 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-09 02:30:33 -0700 |
| commit | 7b02b85a66fee6b357e02f9e70dd0baa0fd24308 (patch) | |
| tree | 669e311d54227e9bc883b51951b3274ebd6bd270 /git-svn.perl | |
| parent | git-diff: don't squelch the new SHA1 in submodule diffs (diff) | |
| download | tgif-7b02b85a66fee6b357e02f9e70dd0baa0fd24308.tar.xz | |
git-svn: understand grafts when doing dcommit
Use the rev-list --parents functionality to read the parents
of the commit. cat-file only shows the raw object with the
original parents and doesn't take into account grafts; so
we'll rely on rev-list machinery for the smarts here.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/git-svn.perl b/git-svn.perl index fbd4691bc5..f8181609f9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -841,14 +841,9 @@ sub working_head_info { sub read_commit_parents { my ($parents, $c) = @_; - my ($fh, $ctx) = command_output_pipe(qw/cat-file commit/, $c); - while (<$fh>) { - chomp; - last if ''; - /^parent ($sha1)/ or next; - push @{$parents->{$c}}, $1; - } - close $fh; # break the pipe + chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c)); + $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n"; + @{$parents->{$c}} = split(/ /, $p); } sub linearize_history { |