emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 84a5fe1 7/8: Bump the version


From: Dmitry Gutov
Subject: [elpa] master 84a5fe1 7/8: Bump the version
Date: Sat, 23 Feb 2019 18:35:45 -0500 (EST)

branch: master
commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Bump the version
---
 diff-hl.el | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/diff-hl.el b/diff-hl.el
index 5333789..c467729 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -1,11 +1,11 @@
 ;;; diff-hl.el --- Highlight uncommitted changes using VC -*- lexical-binding: 
t -*-
 
-;; Copyright (C) 2012-2018  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019  Free Software Foundation, Inc.
 
 ;; Author:   Dmitry Gutov <address@hidden>
 ;; URL:      https://github.com/dgutov/diff-hl
 ;; Keywords: vc, diff
-;; Version:  1.8.5
+;; Version:  1.8.6
 ;; Package-Requires: ((cl-lib "0.2") (emacs "24.3"))
 
 ;; This file is part of GNU Emacs.
@@ -249,11 +249,20 @@ the end position as its only argument."
 
 (defun diff-hl-changes-buffer (file backend)
   (let ((buf-name " *diff-hl* "))
-    (diff-hl-with-diff-switches
-     ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
-     (vc-call-backend backend 'diff (list file)
-                      diff-hl-reference-revision nil
-                      buf-name))
+    (condition-case err
+        (diff-hl-with-diff-switches
+         ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
+         (vc-call-backend backend 'diff (list file)
+                          diff-hl-reference-revision nil
+                          buf-name))
+      (error
+       (when (string-match-p "\\`Failed (status 128)" (error-message-string 
err))
+         (diff-hl-with-diff-switches
+          ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
+          (vc-call-backend backend 'diff (list file)
+                           "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
+                           nil
+                           buf-name)))))
     buf-name))
 
 (defun diff-hl-changes ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]