1. 14 Jul, 2018 5 commits
  2. 13 Jul, 2018 6 commits
  3. 30 Jun, 2018 2 commits
  4. 29 Jun, 2018 1 commit
  5. 24 Jun, 2018 1 commit
  6. 21 Jun, 2018 1 commit
  7. 20 Jun, 2018 3 commits
    • Jonas Bernoulli's avatar
      Revert "Force standard source and destination prefixes in diffs" · 2a45ec04
      Jonas Bernoulli authored
      This reverts commit 553fdb0b.
      2a45ec04
    • Jonas Bernoulli's avatar
      Force standard source and destination prefixes in diffs · 553fdb0b
      Jonas Bernoulli authored
      We do this for the same reason for which we used to force the use of
      no prefix at all: in order to be able to correctly parse filenames in
      diffs, we have to know whether a prefix is used and how long it is.
      
      I probably chose "--no-prefix" in ebccd169 to do so, because that
      is only one argument.  Unfortunately Git in some cases ignores that
      argument, namely when the "-L" argument is also used.
      
      Forcing the use of the default prefixes instead should be safer
      because it doesn't matter whether we get the desired output because
      our request was honored or because the user's "diff.noprefix=true"
      was ignored as well.  In both cases the default prefixes are used.
      
      I am choosing "git -C diff.noprefix=false ..." over "git diff
      --src-prefix=a/ --dst-prefix=b/" because that means we don't have to
      make sure we use these arguments where ever "git diff" is called.
      553fdb0b
    • Jonas Bernoulli's avatar
      magit-branch-pull-request: Fix remote variables for upstream prs · 064b6906
      Jonas Bernoulli authored
      67d96c61 and fb98ee0a did it wrong.  Unlike for non-upstream
      pull-requests, we always have to use the name of the upstream
      remote as `branch.<name>.pushRemote' and `pushRequestRemote'
      
      Closes the second issue mentioned in #3417.
      064b6906
  8. 19 Jun, 2018 2 commits
  9. 18 Jun, 2018 2 commits
  10. 16 Jun, 2018 2 commits
  11. 15 Jun, 2018 7 commits
  12. 13 Jun, 2018 1 commit
  13. 12 Jun, 2018 4 commits
    • Basil L. Contovounesios's avatar
      magit-dired-jump: Don't append slash to directory · ae3256b4
      Basil L. Contovounesios authored
      Since GNU Emacs 26.1, specifically commit [1: 3988ceaa1c] addressing
      bug#24409, dired-jump passes a non-nil FILE-NAME argument to
      expand-file-name.  The expansion removes the trailing "/."  which
      magit-dired-jump previously appended to directory name arguments,
      resulting in a jump to the parent of the desired directory.
      
      In place of the "/." approach of Magit commit [2: 5665ba94], call
      file-name-as-directory when magit-file-at-point returns a directory.
      This is necessary because magit-file-at-point returns a submodule path
      without a trailing slash, and we want to jump to the submodule
      directory not the parent directory.
      
      In addition, simplify magit-dired-jump by passing a FILE-NAME argument
      of nil to dired-jump when no file is detected at point, as dired-jump
      will default to default-directory in this case.
      
      [1: 3988ceaa1c]: 2016-09-14 00:04:32 +0900
        dired-jump: Expand file-name before dired-goto-file call
        https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=3988ceaa1cfa2022443906750cbb30127a1e161f
      
      [2: 5665ba94]: 2016-10-06 19:07:30 +0200
        magit-dired-jump: visit directory, not parent directory
        https://github.com/magit/magit/commit/5665ba9406b40e4cab97866b220e404211a4bd90
      ae3256b4
    • Jonas Bernoulli's avatar
      Cosmetics · 0cd86a08
      Jonas Bernoulli authored
      `eieio--known-slot-names' is defined in all supported Emacsen.
      0cd86a08
    • Jonas Bernoulli's avatar
      Merge branch 'maint' · 38b5d1be
      Jonas Bernoulli authored
      38b5d1be
    • 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
  14. 11 Jun, 2018 1 commit
    • Kyle Meyer's avatar
      magit-log-wash-rev: Fix cherry mode failure on Emacs 26 · 1ee577b3
      Kyle Meyer authored
      magit-log-wash-rev calls member on (cadr magit-refresh-args).  This
      value is a list in magit-log-mode, but it's a string in
      magit-cherry-mode.  On Emacs 26 and later, calling member with a
      string as the second argument fails:
      
        emacs25.3> (member "x" "y") => nil
        emacs26.1> (member "x" "y") => Wrong type argument: listp, "y"
           master> (member "x" "y") => Wrong type argument: listp, "y"
      1ee577b3
  15. 10 Jun, 2018 2 commits