undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: allow dcommit --no-rebase to commit multiple, dependent changes

Browse Source 
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Wong 2008-01-02 10:09:49 -08:00 committed by Junio C Hamano
parent eab827072d
commit 7dfa16b9dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-svn.perl
View File

@ -418,7 +418,7 @@ sub cmd_dcommit {
warn "Attempting to commit more than one change while ", warn "Attempting to commit more than one change while ",
"--no-rebase is enabled.\n", "--no-rebase is enabled.\n",
"If these changes depend on each other, re-running ", "If these changes depend on each other, re-running ",
"without --no-rebase will be required." "without --no-rebase may be required."
} }
while (1) { while (1) {
my $d = shift @$linear_refs or last; my $d = shift @$linear_refs or last;
@ -453,6 +453,7 @@ sub cmd_dcommit {
$parents->{$d}; $parents->{$d};
} }
$_fetch_all ? $gs->fetch_all : $gs->fetch; $_fetch_all ? $gs->fetch_all : $gs->fetch;
$last_rev = $cmt_rev;
next if $_no_rebase; next if $_no_rebase;
# we always want to rebase against the current HEAD, # we always want to rebase against the current HEAD,
@ -512,7 +513,6 @@ sub cmd_dcommit {
$parents = \%p; $parents = \%p;
$linear_refs = \@l; $linear_refs = \@l;
} }
$last_rev = $cmt_rev;
} }
} }
unlink $gs->{index}; unlink $gs->{index};