Merge commit '74359821' into js/reflog-delete

[git.git] / contrib / emacs / git.el

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index f69b697f8d5891b7a16e6d4769bdc3642209b747..cc21e9c682e4b4528de03f59e0ff8b8e6ef26b8d 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -728,7 +728,7 @@ Return the list of files that haven't been handled."
 (defun git-run-ls-files-with-excludes (status files default-state &rest options)
   "Run git-ls-files on FILES with appropriate --exclude-from options."
   (let ((exclude-files (git-get-exclude-files)))
-    (apply #'git-run-ls-files status files default-state "--directory"
+    (apply #'git-run-ls-files status files default-state "--directory" "--no-empty-directory"
            (concat "--exclude-per-directory=" git-per-dir-ignore-file)
            (append options (mapcar (lambda (f) (concat "--exclude-from=" f)) exclude-files)))))