From: Gustav Hållberg <gustav@gmail.com>
Date: Wed, 12 May 2010 18:14:12 +0000 (+0200)
Subject: stgit.el: Fix showing diff in file that has been both copied and modified
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/108e5c89c7f9be40eea16387bb5eb14d1836b681?ds=sidebyside;hp=53055a5601af63a41f68ad68214b8ba4775d4238

stgit.el: Fix showing diff in file that has been both copied and modified

Use --diff-filter=C when showing the diff of the copy operation.

Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
---

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 1bc78a2..564714b 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -2016,6 +2016,8 @@ which stage to diff against in the case of unmerged files."
                                      (list unmerged-stage))
                                     (t
                                      (list (concat patch-id "^") patch-id)))
+                              (and (eq (stgit-file->status patched-file) 'copy)
+                                   '("--diff-filter=C"))
                               '("--")
                               (if (stgit-file->copy-or-rename patched-file)
                                   (list (stgit-file->cr-from patched-file)