summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-09-03 00:55:46 -0400
committerKyle Meyer <kyle@kyleam.com>2015-09-03 00:56:41 -0400
commitf9ab4a692f7abb6b56f49272091bec387eaee57b (patch)
treeabd4c6d97ae6e0206a51cd8792192024af2d7505
parent69965c45cb7a78832633e04b7ed32f78bc346788 (diff)
downloademacs.d-f9ab4a692f7abb6b56f49272091bec387eaee57b.tar.gz
Replace magit-commit-extend-all with single file variant
-rw-r--r--lisp/init-git.el18
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index d6ac3c9..9a803d2 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -69,12 +69,18 @@ CHOOSE-PROJECT is non-nil, prompt for the project name."
(magit-show-commit hash))
(user-error "No hash found at point")))
-(defun km/magit-commit-extend-all ()
- "Run `magit-commit-extend' with '--all' flag.
-This can easily be done from the popup menu but is put into a
-function for calling from outside Magit buffers."
+(defun km/magit-commit-extend-with-file ()
+ "Extend last commit with changes in the current file."
(interactive)
- (magit-commit-extend '("--all")))
+ (let ((file (or (buffer-file-name (buffer-base-buffer))
+ (user-error "Not visiting file"))))
+ (cond ((magit-anything-staged-p)
+ (user-error "There are already staged changes"))
+ ((member (magit-file-relative-name file) (magit-modified-files))
+ (magit-stage-file file)
+ (magit-commit-extend))
+ (t
+ (message "No changes to %s" file)))))
(defun km/magit-ff-merge-upstream ()
"Perform fast-forward merge of upstream branch.
@@ -495,7 +501,7 @@ prompt for REV-A."
(define-key km/git-map "." 'km/magit-show-commit-at-point)
(define-key km/git-map "c" 'km/magit-copy-commit-summary)
(define-key km/git-map "d" 'magit-dispatch-popup)
- (define-key km/git-map "e" 'km/magit-commit-extend-all)
+ (define-key km/git-map "e" 'km/magit-commit-extend-with-file)
(define-key km/git-map "f" 'km/magit-reset-file)
(define-key km/git-map "n" 'km/magit-shorten-hash-at-point)
(define-key km/git-map "l" 'magit-log-buffer-file)