aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Whitton2025-04-07 10:05:08 +0800
committerSean Whitton2025-04-07 10:05:08 +0800
commit3ccd25f6b01bcd2e103faa86b11c10017b64e69b (patch)
tree47ffa8acd39e867b9b7614821975253ca2725b2d
parent7f60aa45aab4191a44d6d83ec6c3004e4901469b (diff)
downloademacs-3ccd25f6b01bcd2e103faa86b11c10017b64e69b.tar.gz
emacs-3ccd25f6b01bcd2e103faa86b11c10017b64e69b.zip
* lisp/vc/vc-git.el (vc-git-checkin): Actually pass down TO-STASH.
-rw-r--r--lisp/vc/vc-git.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 869e9737422..fe9791d2f47 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1204,7 +1204,7 @@ It is based on `log-edit-mode', and has Git-specific extensions."
1204 (unwind-protect 1204 (unwind-protect
1205 (vc-git-command nil 0 nil "apply" "--cached" patch-file) 1205 (vc-git-command nil 0 nil "apply" "--cached" patch-file)
1206 (delete-file patch-file)))) 1206 (delete-file patch-file))))
1207 (when to-stash (vc-git--stash-staged-changes files))) 1207 (when to-stash (vc-git--stash-staged-changes to-stash)))
1208 ;; When operating on the whole tree, better pass "-a" than ".", 1208 ;; When operating on the whole tree, better pass "-a" than ".",
1209 ;; since "." fails when we're committing a merge. 1209 ;; since "." fails when we're committing a merge.
1210 (apply #'vc-git-command nil 0 1210 (apply #'vc-git-command nil 0