1. 21 Oct, 2018 1 commit
  2. 14 Jul, 2018 2 commits
  3. 17 Jan, 2018 1 commit
  4. 07 Jan, 2018 1 commit
  5. 28 Dec, 2017 1 commit
  6. 24 Oct, 2017 1 commit
  7. 10 Jun, 2017 1 commit
  8. 28 May, 2017 1 commit
    • Kyle Meyer's avatar
      magit-modified-files: rename to magit-unstaged-files · e55874f0
      Kyle Meyer authored
      Mark magit-modified-files as obsolete and rename it to
      magit-unstaged-files [*] because the new name 1) aligns nicely with
      the name magit-staged-files and 2) makes it clearer that the returned
      list is restricted to files with unstaged changes.
      
      [*] Unlike the just-deleted magit-unstaged-files, magit-modified-files
          does not include files that only have staged changes.
      e55874f0
  9. 06 May, 2017 1 commit
  10. 12 Mar, 2017 1 commit
  11. 04 Jan, 2017 2 commits
  12. 29 Dec, 2016 1 commit
  13. 27 Dec, 2016 1 commit
  14. 22 Dec, 2016 2 commits
    • Jonas Bernoulli's avatar
    • Jonas Bernoulli's avatar
      Place magit-{*}-arguments in new magit-git-arguments group · 33c5c1ca
      Jonas Bernoulli authored
      Most options named `magit-TOPIC-arguments' specify the arguments
      that are enabled by default in the respective `magit-TOPIC-popup'.
      Previously most of these options were placed in the `magit-commands'
      Custom group, which made that group rather noisy.  A few were placed
      in others group, which was inconsistent and in most cases an oversight.
      
      To avoid having to specify the group for each and every popup defined
      in Magit and in third-party extensions that share the "magit-" prefix,
      teach `magit-define-popup' to use `magit-git-arguments' if GROUP isn't
      specified and NAME does begin with "magit-".
      
      Also place `magit-git-global-arguments' into this group.  Remove it
      from `magit', but keep it in `magit-process' as before.
      33c5c1ca
  15. 20 Dec, 2016 1 commit
    • Jonas Bernoulli's avatar
      magit-hook-custom-get: new function used to initialize hook options · d6b820c1
      Jonas Bernoulli authored
      Third-party hooks should not be defined as options, at least not when
      they have a non-nil value, because otherwise an early `add-hook' would
      not add to the hook but initialize it to just the added function.  But
      users expect to be able to customize hooks, so we do it anyway.
      
      Previously each `defcustom' form that defines a hook was preceded by a
      form which made sure that the default functions got added to the hook
      even when users added their own functions earlier.  Unfortunately, and
      surprisingly long undiscovered, that had the side-effect of overriding
      any customization made using the Custom interface.
      
      Now we use an approach that works in both cases, obviously.
      
      Fixes #2902.
      d6b820c1
  16. 13 Oct, 2016 1 commit
  17. 07 Jul, 2016 1 commit
    • Noam Postavsky's avatar
      magit-ediff-stage: use same encoding for all texts · ab94d5b5
      Noam Postavsky authored
      When using ediff to stage, the working tree file is visited by Emacs in
      the normal way, so Emacs applies normal encoding detection on it.  We
      must apply the same encoding to the output of `git cat-file' (used by
      magit-find-file-{,index}-noselect) so that ediff can apply diffs
      sensibly.
      
      When writing back the changes back to git (via magit-update-index), we
      have to use the same encoding to write as the one used to read, or else
      we may end up changing the file recorded in git in a completely
      unintended way.
      ab94d5b5
  18. 11 Mar, 2016 4 commits
  19. 02 Mar, 2016 2 commits
  20. 01 Jan, 2016 1 commit
  21. 08 Dec, 2015 1 commit
  22. 11 Nov, 2015 1 commit
  23. 25 Sep, 2015 1 commit
    • Kyle Meyer's avatar
      magit-ediff-resolve: clean up failed resolution · f19d0d85
      Kyle Meyer authored
      When the user indicates that the resolution was unsuccessful, don't
      modify the original buffer.  This prevents markers like
      
          ++<<<<<<< HEAD
          [...]
          ++||||||| parent of [...]
          [...]
          ++=======
          [...]
          ++>>>>>>> [...]
      
      from being converted to
      
          ++<<<<<<< variant A
          [...]
          ++>>>>>>> variant B
          [...]
          ++####### Ancestor
          [...]
          ++======= end
      
      Re: #2289.
      f19d0d85
  24. 02 Sep, 2015 1 commit
  25. 04 Aug, 2015 1 commit
    • Kyle Meyer's avatar
      magit-ediff: run commands from top-level directory · 6d2d98ec
      Kyle Meyer authored
      All magit-ediff commands require that the file argument is relative to
      the top-level directory.  However, if called from a buffer where
      default-directory is not the top-level directory, this results in the
      wrong file name being passed to functions like find-file-noselect and
      get-file-buffer.
      
      For all magit-ediff commands that have the possibility of using files
      from the working tree, set default-directory to the top-level directory.
      
      Fixes #2143
      6d2d98ec
  26. 27 Jul, 2015 3 commits
    • Jonas Bernoulli's avatar
      define hooks like we are supposed too · a5798b23
      Jonas Bernoulli authored
      Users are allowed to use `add-hook' et al. to add hook functions to hook
      variables which have not yet been declared.  That means that the default
      value of hook variables should not be set inside `defvar' and defcustom'
      forms, because those definitions are only evaluated if the variable has
      no value yet (in case of `defcustom' it would be used to get the default
      value though).  When the user used `add-hook' earlier, then it obviously
      has a value.  So we are supposed to set the default value outside of the
      declaration form, using `add-hook'.  But that has a few downsides too.
      
      If we set the default value outside of `defcustom', then Custom would
      think that the default value is `nil' (and would be right about that)
      and tell the user about it, which could confuse her a lot.
      
      So we set the default value inside `defcustom' *and* outside using
      `add-hook'. Sight.  That's still not good enough though.  Re-evaluating
      the file or buffer containing these `add-hook' forms would override all
      user customization.
      
      So we place the calls to `add-hook' before that to `defcustom' and
      additionally wrap the calls to `add-hook' to make sure they are only
      ever run once.  Sight.
      
      (unless (find-lisp-object-file-name 'HOOK-VARIABLE 'defvar) ...)
        (add-hook 'HOOK-VARIABLE ...) ...)
      (defcustom HOOK-VARIABLE '(...)
        :options '(...)
        ...)
      
      Double sight.
      
      We *don't* do the above for section hooks, which users are supposed to
      modify using `magit-add-section-hook'.  Instead we teach that function
      to raise an error when the user attempts to add a hook function to a
      hook variable which has not been defined yet.
      
      Re #2004.
      a5798b23
    • Kyle Meyer's avatar
      7847d1d1
    • Kyle Meyer's avatar
      clean up tabs in code · 04ac62ed
      Kyle Meyer authored
      04ac62ed
  27. 23 Jul, 2015 1 commit
  28. 22 Jul, 2015 4 commits