From 108e5c89c7f9be40eea16387bb5eb14d1836b681 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustav=20H=C3=A5llberg?= Date: Wed, 12 May 2010 20:14:12 +0200 Subject: [PATCH] stgit.el: Fix showing diff in file that has been both copied and modified MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use --diff-filter=C when showing the diff of the copy operation. Signed-off-by: Gustav HÃ¥llberg Signed-off-by: David KÃ¥gedal --- contrib/stgit.el | 2 ++ 1 file changed, 2 insertions(+) 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) -- 2.11.0