dgit, git-debrebase: Properly make patches with nasty .gitignores.

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index fe11251a9a7d95022af614537c5a3cd09d42c182..04befff5484477c888825954b20ae53c760ce983 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1351,6 +1351,8 @@ END
         'launder for new upstream';
 
     my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
+    local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
+       "debrebase new-upstream $new_version: rebase";
     runcmd @cmd;
     # now it's for the user to sort out
 }
@@ -1502,7 +1504,7 @@ sub make_patches_staged ($) {
            { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
            failedcmd @gbp_cmd;
        }
-       runcmd @git, qw(add debian/patches);
+       runcmd @git, qw(add -f debian/patches);
     };
 }