diff options
| author | Gustav Hållberg <gustav@gmail.com> | 2010-05-12 20:14:12 +0200 |
|---|---|---|
| committer | Gustav Hållberg <gustav@gmail.com> | 2010-05-27 14:26:36 +0200 |
| commit | 108e5c89c7f9be40eea16387bb5eb14d1836b681 (patch) | |
| tree | c9447276b731e367a0690faf7c4158ecf6e9c5b8 | |
| parent | 53055a5601af63a41f68ad68214b8ba4775d4238 (diff) | |
| download | stgit-108e5c89c7f9be40eea16387bb5eb14d1836b681.tar.gz | |
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>
| -rw-r--r-- | contrib/stgit.el | 2 |
1 files changed, 2 insertions, 0 deletions
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) |