[elpa] master 1a92768 2/3: Separate versions from file names with --

[Tino Calancha]

branch: master
commit 1a927685dcb546c27b0e119dc33bccd55147e56a
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    Separate versions from file names with --
    
    Bump version to v0.5.4
    * packages/gited/gited.el (gited-diff):
    Add separator (--) after versions.
    
    * packages/gited/gited-tests.el (gited-diff-test): Add test.
---
 packages/gited/gited-tests.el | 14 ++++++++++++++
 packages/gited/gited.el       |  5 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/gited/gited-tests.el b/packages/gited/gited-tests.el
index e72e32e..fff6de5 100644
--- a/packages/gited/gited-tests.el
+++ b/packages/gited/gited-tests.el
@@ -198,6 +198,20 @@ Return the last evaled BODY form."
       (delete-directory dir1 'recursive)
       (delete-directory dir2 'recursive))))
 
+(ert-deftest gited-diff-test ()
+  "Test for `gited-diff'.
+Create a repository with 2 identical branches, `master' and `foo'.
+Each branch contains just one file `foo'.  Since this file has same name as one
+of the branches, then we must add '--' after the versions.
+For example, the Git command to get the diff between the 2 branches is as 
follows:
+git diff master foo --."
+  (skip-unless (executable-find vc-git-program))
+  (let ((dir (make-temp-file "gited" 'dir))
+        (inhibit-message t))
+    (with-gited-repo dir
+      (gited-copy-branch "master" gited-initial-filename)
+      (with-specified-completion-branch gited-initial-filename
+        (should-not (gited-diff "master"))))))
 
 (provide 'gited-tests)
 ;;; gited-tests.el ends here
diff --git a/packages/gited/gited.el b/packages/gited/gited.el
index 5900c7a..283e5cb 100644
--- a/packages/gited/gited.el
+++ b/packages/gited/gited.el
@@ -12,7 +12,7 @@
 ;; Package-Requires: ((emacs "24.4") (cl-lib "0.5"))
 ;; Last-Updated: Tue Jul 30 18:28:26 CEST 2019
 ;;           By: calancha
-;;     Update #: 697
+;;     Update #: 698
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -1974,8 +1974,7 @@ diff OLD-REF REF."
     (with-current-buffer buf
       (let ((inhibit-read-only t))
         (erase-buffer)
-        (gited-git-command `("diff" ,old-ref ,ref)
-                           (current-buffer)))
+        (gited-git-command `("diff" ,old-ref ,ref "--") (current-buffer)))
       (display-buffer buf))
     (gited--set-output-buffer-mode buf 'diff)))