summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 10:41:43 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 11:38:11 +0100
commit55b32c7177b49f38528dabff534a743c28339844 (patch)
tree18d1463b21b0f342cf44ba3cdc37af2aebc6b587
parent499215e8030c9966577574a6ada7ef0f03df8db7 (diff)
git-debrebase: Reverse argumennts to check diff error message
"Old, new" is more conventional. This makes debug output and error messages a bit easier to understand. We must keep the backward order for get_differs because we need to detect patch deletion, which shows up (reversed) as D_PAT_ADD. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index f72625d..5049ca6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1326,7 +1326,7 @@ sub walk ($;$$$) {
};
my $final_check = get_differs $build, $input;
- die sprintf "internal error %#x %s %s", $final_check, $build, $input
+ die sprintf "internal error %#x %s %s", $final_check, $input, $build
if $final_check & ~D_PAT_ADD;
my @r = ($build, $breakwater, $last_anchor);