kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/cvsimport' into next 

* jc/cvsimport:
  cvsimport: fix reading from rev-parse
maint
Junio C Hamano 2006-03-18 02:05:22 -08:00
parent c816a6bc5a cb9594e28c
commit c534c4ba7e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-cvsimport.perl
View File

@ -881,6 +881,7 @@ if($orig_branch) {
} }
my $tip_at_end = `git-rev-parse --verify HEAD`; my $tip_at_end = `git-rev-parse --verify HEAD`;
if ($tip_at_start ne $tip_at_end) { if ($tip_at_start ne $tip_at_end) {
for ($tip_at_start, $tip_at_end) { chomp; }
print "Fetched into the current branch.\n" if $opt_v; print "Fetched into the current branch.\n" if $opt_v;
system(qw(git-read-tree -u -m), system(qw(git-read-tree -u -m),
$tip_at_start, $tip_at_end); $tip_at_start, $tip_at_end);