diff options
| -rwxr-xr-x | git-debrebase | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index bee0249..36f73d7 100755 --- a/git-debrebase +++ b/git-debrebase @@ -50,11 +50,9 @@ usages: See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit). END -our ($opt_force, $opt_careful, $opt_noop_ok, @opt_anchors); +our ($opt_force, $opt_noop_ok, @opt_anchors); our ($opt_defaultcmd_interactive); -$opt_careful = 0; - our $us = qw(git-debrebase); our $wrecknoteprefix = 'refs/debrebase/wreckage'; @@ -1600,7 +1598,7 @@ sub walk ($;$$$) { printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n"; } } - if ($rewriting || $opt_careful) { + if ($rewriting) { read_tree_upstream $want_upstream, 0, $want_debian; my $newtree = cmdoutput @git, qw(write-tree); |