diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-git.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index bf7b7fb9e17..b71dc95dba2 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -220,11 +220,10 @@ matching the resulting Git log output, and KEYWORDS is a list of | |||
| 220 | (let ((diff (vc-git--run-command-string | 220 | (let ((diff (vc-git--run-command-string |
| 221 | file "diff-index" "-p" "--raw" "-z" "HEAD" "--"))) | 221 | file "diff-index" "-p" "--raw" "-z" "HEAD" "--"))) |
| 222 | (if (and diff | 222 | (if (and diff |
| 223 | (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(\\(?:.\\|\n\\)*\\)\\'" | 223 | (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(.\\)?" |
| 224 | diff)) | 224 | diff)) |
| 225 | (let ((diff-letter (match-string 1 diff)) | 225 | (let ((diff-letter (match-string 1 diff))) |
| 226 | (diff-contents (match-string 2 diff))) | 226 | (if (not (match-beginning 2)) |
| 227 | (if (not (string-match "\n." diff-contents)) | ||
| 228 | ;; Empty diff: file contents is the same as the HEAD | 227 | ;; Empty diff: file contents is the same as the HEAD |
| 229 | ;; revision, but timestamps are different (eg, file | 228 | ;; revision, but timestamps are different (eg, file |
| 230 | ;; was "touch"ed). Update timestamp in index: | 229 | ;; was "touch"ed). Update timestamp in index: |