From 91f6d93d44a430cb206457e356f70eda18f714a0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 20:32:57 +0100
Subject: [PATCH] git-debrebase: New walk mechanism: Drop obsolete $opt_careful

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index bee02497..36f73d70 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);
-- 
2.30.2