1. 03 Nov, 2018 1 commit
    • Jonas Bernoulli's avatar
      Do not merge into wipref when continuing a sequence · a94bc130
      Jonas Bernoulli authored
      Running a command like "git rebase --continue" can result in the user
      being asked to edit a commit message.  When the user confirms the
      message then `with-editor-post-finish-hook' is run. `magit-wip-commit'
      may be a member of that hook.
      
      Trying to commit to the wipref is unsafe when "git rebase" is running.
      It may result in "git rebase" failing because we hold the index.look,
      or committing failing because some child of "git rebase" does so.
      
      Teach `magit-wip-maybe-add-commit-hook', which is responsible for
      adding that function when appropriate, to not do so when the commit
      was initiated by a command that calls a "git" command that does other
      things after creating the commit.
      a94bc130
  2. 21 Oct, 2018 2 commits
  3. 09 Oct, 2018 1 commit
  4. 14 Sep, 2018 1 commit
    • Jonas Bernoulli's avatar
      magit-section-when: Stop using it as originally intended · 39fe824f
      Jonas Bernoulli authored
      Only three functions used `magit-section-when' as originally intended,
      indicating that it probably isn't as useful as imagined.  Another
      function uses it a strange way that isn't used anywhere else, even
      though `magit-section-when's doc-string hints at such a use-case.
      
      Stop using `magit-section-when' like that, so that it can be
      deprecated and be replaced with a function that better suits the
      majority of callers.  The remaining callers use `magit-section-when'
      in a way that does not justify the "when" in its name.
      39fe824f
  5. 13 Sep, 2018 1 commit
    • Jonas Bernoulli's avatar
      magit-log-select-arguments: add --graph to default value · f795f1a6
      Jonas Bernoulli authored
      And stop hard-coding `--graph' in `magit-commit-squash-internal'.
      This makes it possible for users NOT to use `--graph' if that has
      negative effects on performance.  On the other hand it also means
      that all uses of `magit-log-select' now show the graph by default,
      but the latter might actually be beneficial too.
      
      Re #3559.
      f795f1a6
  6. 04 Aug, 2018 1 commit
  7. 14 Jul, 2018 2 commits
  8. 12 Jun, 2018 1 commit
    • Miciah Masters's avatar
      Fix magit-commit-add-log with commit.verbose=true · 52059dca
      Miciah Masters authored
      When Git was configured with commit.verbose=true, magit-commit-add-log
      would append lines after the diff, past the cut line.  It should avoid
      appending lines after the first comment.
      
      * lisp/magit-commit.el (magit-commit-add-log-insert): Narrow the region
      to include everything up to the first comment.
      52059dca
  9. 10 Jun, 2018 1 commit
  10. 07 Jun, 2018 2 commits
  11. 12 May, 2018 3 commits
  12. 20 Apr, 2018 1 commit
  13. 02 Mar, 2018 1 commit
  14. 02 Feb, 2018 1 commit
  15. 07 Jan, 2018 1 commit
  16. 05 Nov, 2017 1 commit
    • Jonas Bernoulli's avatar
      magit-commit-diff: never give up · d25fb656
      Jonas Bernoulli authored
      Fallback to the same base logic as `magit-diff-while-committing' to
      decide what diff to display instead of giving up when we don't know
      what diff to display based on `last-command'.
      
      We cannot use that function, because if we did then we might end up
      toggling to the "other diff" if the diff buffer already exists.
      
      The "unrecord" and "abort" logic have be moved to the "outside".
      d25fb656
  17. 23 Oct, 2017 1 commit
  18. 11 Oct, 2017 4 commits
  19. 07 Oct, 2017 3 commits
  20. 09 Aug, 2017 1 commit
  21. 11 Jul, 2017 1 commit
    • Kyle Meyer's avatar
      magit-commit-popup: add custom reader for --reuse-message · 9eb60c0c
      Kyle Meyer authored
      As mentioned in git-reset's manpage, ORIG_HEAD can be useful for
      undoing a commit and reusing its message (though there are of course
      other ways to do this).  Define a reader for the --reuse-message
      option that offers ORIG_HEAD as the default value when it exists.
      
      Also, prompt with all ref names.  If these aren't useful for the given
      situation, the user can ignore them and enter an arbitrary value.
      
      Closes #3110.
      9eb60c0c
  22. 10 Jun, 2017 1 commit
  23. 12 Mar, 2017 1 commit
  24. 05 Feb, 2017 1 commit
  25. 19 Jan, 2017 1 commit
    • Jonas Bernoulli's avatar
      While committing, diff from inside gitdir if necessary · 9e0e2a24
      Jonas Bernoulli authored
      If a repository is created using `git init --separate-git-dir', then
      that does not set `core.worktree' (unlike what `git submodule' does).
      
      When committing inside such a repository `magit-commit-diff' is run
      inside the gitdir, and there is no way to prevent that.  Luckily `git
      diff' also works inside the gitdir, but because many other commands
      don't, we always run everything in the working tree.
      
      This is fairly deeply ingrained, so we have to add a kludge to
      `magit-toplevel', that causes it to return the gitdir instead,
      and that is triggered by dynamically binding the new variable
      `magit-toplevel--force-fallback-to-gitdir' to a non-nil value.
      
      And `magit-commit-diff' now does so to fix #2955.
      9e0e2a24
  26. 04 Jan, 2017 1 commit
  27. 29 Dec, 2016 3 commits
  28. 27 Dec, 2016 1 commit