From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 09:41:43 +0000 (+0100)
Subject: git-debrebase: Reverse argumennts to check diff error message
X-Git-Tag: archive/debian/6.7~145
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=55b32c7177b49f38528dabff534a743c28339844

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>
---

diff --git a/git-debrebase b/git-debrebase
index f72625d6..5049ca6d 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);