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

Rewrite aborting. (R)

Browse source
This commit is contained in:
Marius Vollmer 2008-09-07 22:51:42 +03:00
parent 8897b0552c
commit 8460d4db78
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
magit.el
View file

@ -273,11 +273,15 @@ Many Magit faces inherit from this one by default."
(magit-commit-at-point t)) (magit-commit-at-point t))
(defun magit-file-uptodate-p (file) (defun magit-file-uptodate-p (file)
(eq (magit-shell-exit-code "git diff --quiet %s" file) 0)) (eq (magit-shell-exit-code "git diff --quiet -- %s" file) 0))
(defun magit-anything-staged-p () (defun magit-anything-staged-p ()
(not (eq (magit-shell-exit-code "git diff --quiet --cached") 0))) (not (eq (magit-shell-exit-code "git diff --quiet --cached") 0)))
(defun magit-everything-clean-p ()
(and (not (magit-anything-staged-p))
(eq (magit-shell-exit-code "git diff --quiet") 0)))
;;; Sections ;;; Sections
;; A buffer in magit-mode isorganized into hierarchical sections. ;; A buffer in magit-mode isorganized into hierarchical sections.
@ -1286,6 +1290,18 @@ Please see the manual for a complete description of Magit.
"\n")))) "\n"))))
(insert "\n")))) (insert "\n"))))
(defun magit-rewrite-abort ()
(interactive)
(let* ((info (magit-read-rewrite-info))
(orig (cadr (assq 'orig info))))
(or info
(error "No rewrite in progress."))
(or (magit-everything-clean-p)
(error "You have uncommitted changes. Abort aborted."))
(when (yes-or-no-p "Abort rewrite? ")
(magit-write-rewrite-info nil)
(magit-run "git" "reset" "--hard" orig))))
;;; Updating, pull, and push ;;; Updating, pull, and push
(defun magit-remote-update () (defun magit-remote-update ()