closes #1: magit-git-string was responsible for trimming the last \n
---
This can be pulled from the t/let-new-line-be of
git://github.com/vanicat/magit.git
And we fix our first issue of the issue tracker \o/
magit.el | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/magit.el b/magit.el
index ad248ed..12fc8c9 100644
--- a/magit.el
+++ b/magit.el
@@ -4041,16 +4041,13 @@ With prefix force the removal even it it hasn't been
merged."
(error "Cannot resolve %s" file))
(with-current-buffer base-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
- (insert (magit-git-string "cat-file" "blob"
- (concat ":1:" file)))))
+ (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:"
file))))))
(with-current-buffer our-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
- (insert (magit-git-string "cat-file" "blob"
- (concat ":2:" file)))))
+ (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:"
file))))))
(with-current-buffer their-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
- (insert (magit-git-string "cat-file" "blob"
- (concat ":3:" file)))))
+ (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:"
file))))))
;; We have now created the 3 buffer with ours, theirs and the ancestor
files
(with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer
their-buffer base-buffer)
(make-local-variable 'magit-ediff-file)
--
1.7.1
