From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 7 Nov 2008 13:28:09 +0000 (+0100)
Subject: git.el: Allow to commit even if there are no marked files.
X-Git-Tag: v1.6.1-rc1~24^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1905a8666a676f7070ba15c6f56f98bb1da20f7b;p=git.git

git.el: Allow to commit even if there are no marked files.

This can be useful to commit a merge that didn't result in any
changes.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 9e9101b17..09e8bae3a 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -895,29 +895,26 @@ Return the list of files that haven't been handled."
               (unless (git-empty-db-p)
                 (setq head (git-rev-parse "HEAD")
                       head-tree (git-rev-parse "HEAD^{tree}")))
-              (if files
-                  (progn
-                    (message "Running git commit...")
-                    (when
-                        (and
-                         (git-read-tree head-tree index-file)
-                         (git-update-index nil files)         ;update both the default index
-                         (git-update-index index-file files)  ;and the temporary one
-                         (setq tree (git-write-tree index-file)))
-                      (if (or (not (string-equal tree head-tree))
-                              (yes-or-no-p "The tree was not modified, do you really want to perform an empty commit? "))
-                          (let ((commit (git-commit-tree buffer tree head)))
-                            (when commit
-                              (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
-                              (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
-                              (with-current-buffer buffer (erase-buffer))
-                              (git-update-status-files (git-get-filenames files))
-                              (git-call-process nil "rerere")
-                              (git-call-process nil "gc" "--auto")
-                              (message "Committed %s." commit)
-                              (git-run-hook "post-commit" nil)))
-                        (message "Commit aborted."))))
-                (message "No files to commit.")))
+              (message "Running git commit...")
+              (when
+                  (and
+                   (git-read-tree head-tree index-file)
+                   (git-update-index nil files)         ;update both the default index
+                   (git-update-index index-file files)  ;and the temporary one
+                   (setq tree (git-write-tree index-file)))
+                (if (or (not (string-equal tree head-tree))
+                        (yes-or-no-p "The tree was not modified, do you really want to perform an empty commit? "))
+                    (let ((commit (git-commit-tree buffer tree head)))
+                      (when commit
+                        (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
+                        (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
+                        (with-current-buffer buffer (erase-buffer))
+                        (git-update-status-files (git-get-filenames files))
+                        (git-call-process nil "rerere")
+                        (git-call-process nil "gc" "--auto")
+                        (message "Committed %s." commit)
+                        (git-run-hook "post-commit" nil)))
+                  (message "Commit aborted."))))
           (delete-file index-file))))))