gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only ever commit staged changes when amending a commit.

Browse source 
The usual behavior of committing all unstaged changes when there are
no staged changes makes it impossible to amend a commit just to fix
the commit message, which is a quite common thing to do.

* magit.el (magit-log-edit-commit): Do not pass "--all" to git commit
when amending.
This commit is contained in:
Marius Vollmer 2009-02-10 23:28:21 +02:00
parent 8a979172c8
commit f89a045282
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
magit.el
View file

@ -2098,12 +2098,13 @@ Prefix arg means justify as well."
(let ((commit-buf (current-buffer)))
(with-current-buffer (magit-find-buffer 'status default-directory)
(cond (tag
(magit-run-with-input commit-buf
magit-git-executable "tag" tag "-a" "-F" "-"))
(magit-run-with-input
commit-buf
magit-git-executable "tag" tag "-a" "-F" "-"))
(t
(apply #'magit-run-with-input commit-buf
magit-git-executable "commit" "-F" "-"
(append (if (not (magit-anything-staged-p))
(append (if (not (or amend (magit-anything-staged-p)))
'("--all") '())
(if amend '("--amend") '())
(if magit-commit-signoff

5
magit.texi
View file

@ -240,7 +240,10 @@ committed.
You can type @kbd{C-c C-a} in the buffer with the change description
toggles a flag that determines whether the next commit will be a
@emph{amending} one.
@emph{amending} one. When amending a commit, only the staged changes
are committed, even if there are none. (Normally, all unstaged
changes are committed when there are no staged changes.) This allows
you to easily modify the message of the last commit.
Typing @kbd{C} will also pop up the change description buffer, but in
addition, it will try to insert a ChangeLog-style entry for the change