diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2017-11-04 14:29:00 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2017-11-05 21:33:57 +0100 |
| commit | a7c19b983546ddc871e183dddf96e8131ccbfa93 (patch) | |
| tree | 4aad579cb7ae6a26b6910249cab99cf6184bdabe /lisp/magit-diff.el | |
| parent | ead60dbcdd8746db35a2e95a554f63e7d381366b (diff) | |
magit-diff-while-committing: remove redundant code
This should have been removed in b079961174 when we stopped explicitly
tracking amend operations using a dedicated alist because that's when
it started always returning nil.
Diffstat (limited to 'lisp/magit-diff.el')
| -rw-r--r-- | lisp/magit-diff.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el index 97c440e..876e0ca 100644 --- a/lisp/magit-diff.el +++ b/lisp/magit-diff.el @@ -862,7 +862,6 @@ be committed." (unless (magit-commit-message-buffer) (user-error "No commit in progress")) (let ((magit-display-buffer-noselect t) - (toplevel (magit-toplevel)) (diff-buf (magit-mode-get-buffer 'magit-diff-mode))) (if (and (or ;; most likely an explicit amend (not (magit-anything-staged-p)) @@ -870,10 +869,8 @@ be committed." (and (eq (current-buffer) diff-buf))) (or (not diff-buf) (with-current-buffer diff-buf - (or ;; default to include last commit - (not (equal (magit-toplevel) toplevel)) - ;; toggle to include last commit - (not (car magit-refresh-args)))))) + ;; toggle to include last commit + (not (car magit-refresh-args))))) (magit-diff-while-amending args) (magit-diff-staged nil args)))) |