chiark / gitweb /
git-debrebase: Do not run a no-op rebase in default mode
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Apr 2018 16:01:32 +0000 (17:01 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:07:01 +0000 (16:07 +0100)
No functional change: this is always a no-op, since $breakwater is one
of HEAD's ancestors.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 748b49bc2bc34c644bb06d357325789eb808513c..59b15aa38045ef8a79e7bc2b9cfd5ef0093b64b7 100755 (executable)
@@ -909,7 +909,7 @@ sub cmd_launder_v0 () {
 sub defaultcmd_rebase () {
     push @ARGV, @{ $opt_defaultcmd_interactive // [] };
     my ($tip,$breakwater) = do_launder_head 'launder for rebase';
-    runcmd @git, qw(rebase), @ARGV, $breakwater;
+    runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
 }
 
 sub cmd_analyse () {