fix 6e4d21b6ef7c7dbc483cda5f17a541bb954224b5

Reported-by: Johan Andersson <johan.rejeep@gmail.com>
fix two bugs in magit-commit

* Make sure we don't set `magit-custom-options' global value.
* Respect the prefix argument (AMENDP) when there are staged changes.
remove magit-flow.el for now

Remove the `magit-flow.el' for the time being.  Another
implementation that implements the functionality described at
http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow
will be added at a later time.

This version is removed because it depends on external scripts
that implement this workflow (https://github.com/nvie/gitflow),
which happens to be unmaintained.  It will actually be easier
to rewrite this in directly elisp than wrap around a bugged
external implementation (and eventually having to fork and
maintain that).  Also in most distributions these scripts are
not available through the native package manager.

More importantly though this version has to be removed because
it is very incomplete.  Having this version in the Magit repo
will raise expectations we cannot fulfill at this time; for a
elisp-only implementation to be feasible some existing mess in
the Magit code base has to be cleaned up first, and extenting
the wrapper around the shell scripts would be a waste of time
considering the goal of not relying on these eventually.

See issue #881 for discussion.
make commit at point the default input value for magit-show-commit
README.md: add link label def for `git-modes'

Commit 41b1bb7a added a reference link for `git-modes', but forgot
to add the link label definition.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-display-process': fix displaying the process buffer

Commit e26c9c79 erroneously wrapped the call to `display-buffer'
inside the `unless', meaning if we *had* a buffer to display, the
code to display it *wouldn't* run, essentially causing the process
buffer to never be displayed when the BUFFER arg was non-nil, and
thus breaking `magit-process-popup-time'-based process buffer popup.

Fixes #887.

Signed-off-by: Pieter Praet <pieter@praet.org>
magit.el: add `magit-diff-use-overlays' to `magit-faces' as custom-VARIABLE

Visiting the `magit-diff-use-overlays' option from the `magit-faces'
group resulted in an empty Customize buffer, stating:

  "Group definition missing."

See commit 66a06442.

Fixes #889.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit--bisect-last-pos': properly set prop 'permanent-local to t

Commit 8ce80095 intended to define `magit--bisect-last-pos' as a
permanent buffer-local variable by copy-pasting and adjusting the
sexps which do so for `magit--bisect-info', but forgot to adjust
the line which is supposed to set its 'permanent-local property to t.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-bisect-run': properly set `buffer' and `process'

In an effort to limit the usage of `magit-process-buffer-name',
commit 54f2e7c2 modified `magit-bisect-run' to set `process' and
`buffer' based on the return value of `magit-run-git-async'.

However, `magit-run-git-async' uses `magit-run-git*', which uses
`magit-run*', which returns its `successp' variable, which is either
t or nil, *not* a process object, so `magit-bisect-run' fails when
it tries to set `buffer' by running `process-buffer' on `process':

  Debugger entered--Lisp error: (wrong-type-argument processp t)
  [...]

Fixes #891.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-ignore-item': make LOCAL arg optional

Commit 15c08f9e merged `magit-ignore-item' and `magit--ignore-item', and
for some reason made the LOCAL arg non-optional, causing Emacs to signal
`wrong-number-of-arguments' when running `magit-ignore-item' ("i") on a
file in the status buffer.

Fixes #893.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-revert-item': don't depend on `cl-flet'

Commit 1c7fb237 replaced the `magit-with-revert-confirmation' macro with
the temporary function `confirm', but defined the latter using `cl-flet'
which isn't available in cl-lib 0.3, so use `let' + `funcall' instead.

Fixes #895.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-revert-item': respect `magit-revert-item-confirm'

Commit 1c7fb237 replaced the `magit-with-revert-confirmation' macro with
the temporary function `confirm', but in doing so also removed the check
for `magit-revert-item-confirm', causing `magit-revert-item' to always
ask for confirmation, even if the user configured it not to.

Fixes #896.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-mark-item': fix toggling mark in status buffer

Running `magit-mark-item' on a marked commit is supposed to unmark it.

Since the value stored in `magit-marked-commit' is a string, doing
comparison using `eq' can't possibly work, so use `equal' instead.

BTW, for some odd reason (which I don't feel like investigating right
now), the previous state of affairs *did* in fact *work* in the log
buffer (as opposed to the status buffer).  Doesn't matter anymore
though.  Now it works in both of them...

Fixes #898.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-log-create-author-date-overlays': remove redundant check

Commit d1e19af8 merged `magit-log-create-author-date-overlay'
into `magit-log-set-author-date-overlays' (renamed to
`magit-log-create-author-date-overlays'), but didn't remove the
second check of `magit-log-author-date-overlay'.  This variable
isn't modified between the first and second check, so the latter
is redundant.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-wash-log': call `derived-mode-p' only once

Doing the same thing twice for no additional benefit is always a pain,
so `let'-bind the return value of `derived-mode-p' around the body form.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-status-insert-tags-line': remove redundant option

`magit-insert-status-tags-line' can now be enabled/disabled in
`magit-status-insert-sections-hook' (see commit 9da68462), so the
`magit-status-insert-tags-line' option no longer serves any purpose.

As a side effect, it's now enabled by default, which is a good thing IMO.

Signed-off-by: Pieter Praet <pieter@praet.org>
AUTHORS.md: auto-generated using 'make authors'

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-remote-ref-format': fix docstring

While changing `magit-remote-ref-format's default to 'remote-slash-branch,
commit e7150a0a also corrected some mistakes in its docstring, but didn't
catch them all, and `magit-change-what-branch-tracks' also contained an
erroneous reference to `name-then-remote'.

Signed-off-by: Pieter Praet <pieter@praet.org>
`magit-remote-ref-format' replace :version kw with :package-version

The ":version" keyword specifies in which version of *Emacs* the option
was introduced/changed.  We should use ":package-version" instead.

See (info "(elisp)Common Keywords").

Signed-off-by: Pieter Praet <pieter@praet.org>
Merge pull request #886 from praet/doc

README.md: add link label def for `git-modes'