chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80a0627
)
git-debrebase: WIP FOUND
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 28 Jun 2017 12:40:52 +0000
(13:40 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index b3b5ea691e37cee8775134adefa4818ac4957996..e3835e3d0d796442dc1bb9ba849e0d8b66fb80a2 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-316,7
+316,7
@@
sub classify ($) {
}
sub walk ($;$$);
}
sub walk ($;$$);
-sub walk {
+sub walk
($;$$)
{
my ($input,
$nogenerate,$report) = @_;
# => ($tip, $breakwater_tip)
my ($input,
$nogenerate,$report) = @_;
# => ($tip, $breakwater_tip)
@@
-573,7
+573,7
@@
sub walk {
sub get_head () { return git_rev_parse qw(HEAD); }
sub get_head () { return git_rev_parse qw(HEAD); }
-sub update_head ($$) {
+sub update_head ($$
$
) {
my ($old, $new, $mrest) = @_;
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
my ($old, $new, $mrest) = @_;
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
@@
-602,7
+602,7
@@
sub cmd_analyse () {
STDOUT->error and die $!;
}
STDOUT->error and die $!;
}
-my $toplevel =
runcmd
@git, qw(rev-parse --show-toplevel);
+my $toplevel =
cmdoutput
@git, qw(rev-parse --show-toplevel);
chdir $toplevel or die "chdir $toplevel: $!";
my $cmd = shift @ARGV;
chdir $toplevel or die "chdir $toplevel: $!";
my $cmd = shift @ARGV;