git/git.git
4 years agorefs: introduce an iterator interface
Michael Haggerty [Sat, 18 Jun 2016 04:15:15 +0000 (06:15 +0200)]
refs: introduce an iterator interface

Currently, the API for iterating over references is via a family of
for_each_ref()-type functions that invoke a callback function for each
selected reference. All of these eventually call do_for_each_ref(),
which knows how to do one thing: iterate in parallel through two
ref_caches, one for loose and one for packed refs, giving loose
references precedence over packed refs. This is rather complicated code,
and is quite specialized to the files backend. It also requires callers
to encapsulate their work into a callback function, which often means
that they have to define and use a "cb_data" struct to manage their
context.

The current design is already bursting at the seams, and will become
even more awkward in the upcoming world of multiple reference storage
backends:

* Per-worktree vs. shared references are currently handled via a kludge
  in git_path() rather than iterating over each part of the reference
  namespace separately and merging the results. This kludge will cease
  to work when we have multiple reference storage backends.

* The current scheme is inflexible. What if we sometimes want to bypass
  the ref_cache, or use it only for packed or only for loose refs? What
  if we want to store symbolic refs in one type of storage backend and
  non-symbolic ones in another?

In the future, each reference backend will need to define its own way of
iterating over references. The crux of the problem with the current
design is that it is impossible to compose for_each_ref()-style
iterations, because the flow of control is owned by the for_each_ref()
function. There is nothing that a caller can do but iterate through all
references in a single burst, so there is no way for it to interleave
references from multiple backends and present the result to the rest of
the world as a single compound backend.

This commit introduces a new iteration primitive for references: a
ref_iterator. A ref_iterator is a polymorphic object that a reference
storage backend can be asked to instantiate. There are three functions
that can be applied to a ref_iterator:

* ref_iterator_advance(): move to the next reference in the iteration
* ref_iterator_abort(): end the iteration before it is exhausted
* ref_iterator_peel(): peel the reference currently being looked at

Iterating using a ref_iterator leaves the flow of control in the hands
of the caller, which means that ref_iterators from multiple
sources (e.g., loose and packed refs) can be composed and presented to
the world as a single compound ref_iterator.

It also means that the backend code for implementing reference iteration
will sometimes be more complicated. For example, the
cache_ref_iterator (which iterates over a ref_cache) can't use the C
stack to recurse; instead, it must manage its own stack internally as
explicit data structures. There is also a lot of boilerplate connected
with object-oriented programming in C.

Eventually, end-user callers will be able to be written in a more
natural way—managing their own flow of control rather than having to
work via callbacks. Since there will only be a few reference backends
but there are many consumers of this API, this is a good tradeoff.

More importantly, we gain composability, and especially the possibility
of writing interchangeable parts that can work with any ref_iterator.

For example, merge_ref_iterator implements a generic way of merging the
contents of any two ref_iterators. It is used to merge loose + packed
refs as part of the implementation of the files_ref_iterator. But it
will also be possible to use it to merge other pairs of reference
sources (e.g., per-worktree vs. shared refs).

Another example is prefix_ref_iterator, which can be used to trim a
prefix off the front of reference names before presenting them to the
caller (e.g., "refs/heads/master" -> "master").

In this patch, we introduce the iterator abstraction and many utilities,
and implement a reference iterator for the files ref storage backend.
(I've written several other obvious utilities, for example a generic way
to filter references being iterated over. These will probably be useful
in the future. But they are not needed for this patch series, so I am
not including them at this time.)

In a moment we will rewrite do_for_each_ref() to work via reference
iterators (allowing some special-purpose code to be discarded), and do
something similar for reflogs. In future patch series, we will expose
the ref_iterator abstraction in the public refs API so that callers can
use it directly.

Implementation note: I tried abstracting this a layer further to allow
generic iterators (over arbitrary types of objects) and generic
utilities like a generic merge_iterator. But the implementation in C was
very cumbersome, involving (in my opinion) too much boilerplate and too
much unsafe casting, some of which would have had to be done on the
caller side. However, I did put a few iterator-related constants in a
top-level header file, iterator.h, as they will be useful in a moment to
implement iteration over directory trees and possibly other types of
iterators in the future.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoref_resolves_to_object(): new function
Michael Haggerty [Sat, 18 Jun 2016 04:15:14 +0000 (06:15 +0200)]
ref_resolves_to_object(): new function

Extract new function ref_resolves_to_object() from
entry_resolves_to_object(). It can be used even if there is no ref_entry
at hand.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoentry_resolves_to_object(): rename function from ref_resolves_to_object()
Michael Haggerty [Sat, 18 Jun 2016 04:15:13 +0000 (06:15 +0200)]
entry_resolves_to_object(): rename function from ref_resolves_to_object()

Free up the old name for a more general purpose.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoget_ref_cache(): only create an instance if there is a submodule
Michael Haggerty [Sat, 18 Jun 2016 04:15:12 +0000 (06:15 +0200)]
get_ref_cache(): only create an instance if there is a submodule

If there is not a nonbare repository where a submodule is supposedly
located, then don't instantiate a ref_cache for it.

The analogous check can be removed from resolve_gitlink_ref().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoremote rm: handle symbolic refs correctly
Michael Haggerty [Sat, 18 Jun 2016 04:15:11 +0000 (06:15 +0200)]
remote rm: handle symbolic refs correctly

In the modern world of reference backends, it is not OK to delete a
symref by unlink()ing the file directly. This must be done via the refs
API.

We do so by adding the symref to the list of references to delete along
with the non-symbolic references, then calling delete_refs() with the
new flags option set to REF_NODEREF.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agodelete_refs(): add a flags argument
Michael Haggerty [Sat, 18 Jun 2016 04:15:10 +0000 (06:15 +0200)]
delete_refs(): add a flags argument

This will be useful for passing REF_NODEREF through.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agorefs: use name "prefix" consistently
Michael Haggerty [Sat, 18 Jun 2016 04:15:09 +0000 (06:15 +0200)]
refs: use name "prefix" consistently

In the context of the for_each_ref() functions, call the prefix that
references must start with "prefix". (In some places it was called
"base".) This is clearer, and also prevents confusion with another
planned use of the word "base".

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agodo_for_each_ref(): move docstring to the header file
Michael Haggerty [Sat, 18 Jun 2016 04:15:08 +0000 (06:15 +0200)]
do_for_each_ref(): move docstring to the header file

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agorefs: remove unnecessary "extern" keywords
Michael Haggerty [Thu, 31 Mar 2016 04:19:22 +0000 (06:19 +0200)]
refs: remove unnecessary "extern" keywords

There's continuing work in this area, so clean up unneeded "extern"
keywords rather than schlepping them around. Also split up some overlong
lines and add parameter names in a couple of places.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agolock_ref_sha1_basic(): only handle REF_NODEREF mode
Michael Haggerty [Fri, 22 Apr 2016 13:25:25 +0000 (15:25 +0200)]
lock_ref_sha1_basic(): only handle REF_NODEREF mode

Now lock_ref_sha1_basic() is only called with flags==REF_NODEREF. So we
don't have to handle other cases anymore.

This enables several simplifications, the most interesting of which come
from the fact that ref_lock::orig_ref_name is now always the same as
ref_lock::ref_name:

* Remove ref_lock::orig_ref_name
* Remove local variable orig_refname from lock_ref_sha1_basic()
* ref_name can be initialize once and its value reused
* commit_ref_update() never has to write to the reflog for
  lock->orig_ref_name

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agocommit_ref_update(): remove the flags parameter
Michael Haggerty [Fri, 22 Apr 2016 12:38:56 +0000 (14:38 +0200)]
commit_ref_update(): remove the flags parameter

commit_ref_update() is now only called with flags=0. So remove the flags
parameter entirely.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agolock_ref_for_update(): don't resolve symrefs
Michael Haggerty [Mon, 25 Apr 2016 15:48:32 +0000 (17:48 +0200)]
lock_ref_for_update(): don't resolve symrefs

If a transaction includes a non-NODEREF update to a symbolic reference,
we don't have to look it up in lock_ref_for_update(). The reference will
be dereferenced anyway when the split-off update is processed.

This change requires that we store a backpointer from the split-off
update to its parent update, for two reasons:

* We still want to report the original reference name in error messages.
  So if an error occurs when checking the split-off update's old_sha1,
  walk the parent_update pointers back to find the original reference
  name, and report that one.

* We still need to write the old_sha1 of the symref to its reflog. So
  after we read the split-off update's reference value, walk the
  parent_update pointers back and fill in their old_sha1 fields.

Aside from eliminating unnecessary reads, this change fixes a
subtle (though not very serious) race condition: in the old code, the
old_sha1 of the symref was resolved before the reference that it pointed
at was locked. So it was possible that the old_sha1 value logged to the
symref's reflog could be wrong if another process changed the downstream
reference before it was locked.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agolock_ref_for_update(): don't re-read non-symbolic references
Michael Haggerty [Mon, 25 Apr 2016 15:38:35 +0000 (17:38 +0200)]
lock_ref_for_update(): don't re-read non-symbolic references

Before the previous patch, our first read of the reference happened
before the reference was locked, so we couldn't trust its value and had
to read it again. But now that our first read of the reference happens
after acquiring the lock, there is no need to read it a second time. So
move the read_ref_full() call into the (update->type & REF_ISSYMREF)
block.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefs: resolve symbolic refs first
Michael Haggerty [Mon, 25 Apr 2016 13:56:07 +0000 (15:56 +0200)]
refs: resolve symbolic refs first

Before committing ref updates, split symbolic ref updates into two
parts: an update to the underlying ref, and a log-only update to the
symbolic ref. This ensures that both references are locked correctly
during the transaction, including while their reflogs are updated.

Similarly, if the reference pointed to by HEAD is modified directly, add
a separate log-only update to HEAD, rather than leaving the job of
updating HEAD's reflog to commit_ref_update(). This change ensures that
HEAD is locked correctly while its reflog is being modified, as well as
being cheaper (HEAD only needs to be resolved once).

This makes use of a new function, lock_raw_ref(), which is analogous to
read_raw_ref(), but acquires a lock on the reference before reading it.

This change still has two problems:

* There are redundant read_ref_full() reference lookups.

* It is still possible to get incorrect reflogs for symbolic references
  if there is a concurrent update by another process, since the old_oid
  of a symref is determined before the lock on the pointed-to ref is
  held.

Both problems will soon be fixed.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
WIP

4 years agoref_transaction_update(): check refname_is_safe() at a minimum
Michael Haggerty [Wed, 27 Apr 2016 13:54:45 +0000 (15:54 +0200)]
ref_transaction_update(): check refname_is_safe() at a minimum

If the user has asked that a new value be set for a reference, we use
check_refname_format() to verify that the reference name satisfies all
of the rules. But in other cases, at least check that refname_is_safe().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agounlock_ref(): move definition higher in the file
Michael Haggerty [Sun, 24 Apr 2016 06:11:37 +0000 (08:11 +0200)]
unlock_ref(): move definition higher in the file

This avoids the need for a forward declaration in the next patch.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agolock_ref_for_update(): new function
Michael Haggerty [Sun, 24 Apr 2016 06:58:41 +0000 (08:58 +0200)]
lock_ref_for_update(): new function

Extract a new function, lock_ref_for_update(), from
ref_transaction_commit().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoadd_update(): initialize the whole ref_update
Michael Haggerty [Mon, 25 Apr 2016 09:39:54 +0000 (11:39 +0200)]
add_update(): initialize the whole ref_update

Change add_update() to initialize all of the fields in the new
ref_update object. Rename the function to ref_transaction_add_update(),
and increase its visibility to all of the refs-related code.

All of this makes the function more useful for other future callers.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoverify_refname_available(): adjust constness in declaration
Michael Haggerty [Mon, 25 Apr 2016 09:20:08 +0000 (11:20 +0200)]
verify_refname_available(): adjust constness in declaration

The two string_list arguments can be const.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefs: don't dereference on rename
David Turner [Wed, 24 Feb 2016 22:58:51 +0000 (17:58 -0500)]
refs: don't dereference on rename

When renaming refs, don't dereference either the origin or the destination
before renaming.

The origin does not need to be dereferenced because it is presently
forbidden to rename symbolic refs.

Not dereferencing the destination fixes a bug where renaming on top of
a broken symref would use the pointed-to ref name for the moved
reflog.

Add a test for the reflog bug.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefs: allow log-only updates
David Turner [Wed, 24 Feb 2016 22:58:50 +0000 (17:58 -0500)]
refs: allow log-only updates

The refs infrastructure learns about log-only ref updates, which only
update the reflog.  Later, we will use this to separate symbolic
reference resolution from ref updating.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agodelete_branches(): use resolve_refdup()
Michael Haggerty [Mon, 25 Apr 2016 08:42:19 +0000 (10:42 +0200)]
delete_branches(): use resolve_refdup()

The return value of resolve_ref_unsafe() is not guaranteed to stay
around as long as we need it, so use resolve_refdup() instead.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoref_transaction_commit(): correctly report close_ref() failure
Michael Haggerty [Mon, 25 Apr 2016 09:58:23 +0000 (11:58 +0200)]
ref_transaction_commit(): correctly report close_ref() failure

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoref_transaction_create(): disallow recursive pruning
Michael Haggerty [Sun, 24 Apr 2016 07:48:26 +0000 (09:48 +0200)]
ref_transaction_create(): disallow recursive pruning

It is nonsensical (and a little bit dangerous) to use REF_ISPRUNING
without REF_NODEREF. Forbid it explicitly. Change the one REF_ISPRUNING
caller to pass REF_NODEREF too.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefs: make error messages more consistent
Michael Haggerty [Wed, 27 Apr 2016 13:21:36 +0000 (15:21 +0200)]
refs: make error messages more consistent

* Always start error messages with a lower-case letter.

* Always enclose reference names in single quotes.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agolock_ref_sha1_basic(): remove unneeded local variable
Michael Haggerty [Fri, 22 Apr 2016 07:13:00 +0000 (09:13 +0200)]
lock_ref_sha1_basic(): remove unneeded local variable

resolve_ref_unsafe() can cope with being called with NULL passed to its
flags argument. So lock_ref_sha1_basic() can just hand its own type
parameter through.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): move docstring to header file
Michael Haggerty [Fri, 6 May 2016 15:25:31 +0000 (17:25 +0200)]
read_raw_ref(): move docstring to header file

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): improve docstring
Michael Haggerty [Sun, 24 Apr 2016 06:10:30 +0000 (08:10 +0200)]
read_raw_ref(): improve docstring

Among other things, document the (important!) requirement that input
refname be checked for safety before calling this function.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): rename symref argument to referent
Michael Haggerty [Thu, 21 Apr 2016 23:11:17 +0000 (01:11 +0200)]
read_raw_ref(): rename symref argument to referent

After all, it doesn't hold the symbolic reference, but rather the
reference referred to.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): clear *type at start of function
Michael Haggerty [Thu, 21 Apr 2016 23:11:17 +0000 (01:11 +0200)]
read_raw_ref(): clear *type at start of function

This is more convenient and less error-prone for callers.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): rename flags argument to type
Michael Haggerty [Tue, 26 Apr 2016 01:06:23 +0000 (03:06 +0200)]
read_raw_ref(): rename flags argument to type

This will hopefully reduce confusion with the "flags" arguments that are
used in many functions in this module as an input parameter to choose
how the function should operate.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoref_transaction_commit(): remove local variables n and updates
Michael Haggerty [Thu, 21 Apr 2016 22:02:50 +0000 (00:02 +0200)]
ref_transaction_commit(): remove local variables n and updates

These microoptimizations don't make a significant difference in speed.
And they cause problems if somebody ever wants to modify the function to
add updates to a transaction as part of processing it, as will happen
shortly.

Make the same changes in initial_ref_transaction_commit().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorename_ref(): remove unneeded local variable
Michael Haggerty [Thu, 21 Apr 2016 21:42:19 +0000 (23:42 +0200)]
rename_ref(): remove unneeded local variable

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agocommit_ref_update(): write error message to *err, not stderr
Michael Haggerty [Tue, 26 Apr 2016 07:09:51 +0000 (09:09 +0200)]
commit_ref_update(): write error message to *err, not stderr

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefname_is_safe(): insist that the refname already be normalized
Michael Haggerty [Wed, 27 Apr 2016 10:40:39 +0000 (12:40 +0200)]
refname_is_safe(): insist that the refname already be normalized

The reference name is going to be compared to other reference names, so
it should be in its normalized form.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefname_is_safe(): don't allow the empty string
Michael Haggerty [Wed, 27 Apr 2016 10:42:27 +0000 (12:42 +0200)]
refname_is_safe(): don't allow the empty string

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agorefname_is_safe(): use skip_prefix()
Michael Haggerty [Wed, 27 Apr 2016 10:39:11 +0000 (12:39 +0200)]
refname_is_safe(): use skip_prefix()

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoremove_dir_recursively(): add docstring
Michael Haggerty [Sun, 24 Apr 2016 05:07:59 +0000 (07:07 +0200)]
remove_dir_recursively(): add docstring

Add a docstring for the remove_dir_recursively() function and the
REMOVE_DIR_* flags that can be passed to it.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agosafe_create_leading_directories(): improve docstring
Michael Haggerty [Sun, 24 Apr 2016 02:34:12 +0000 (04:34 +0200)]
safe_create_leading_directories(): improve docstring

Document the difference between this function and
safe_create_leading_directories_const(), and that the former restores
path before returning.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoread_raw_ref(): don't get confused by an empty directory
Michael Haggerty [Thu, 5 May 2016 12:09:41 +0000 (14:09 +0200)]
read_raw_ref(): don't get confused by an empty directory

Even if there is an empty directory where we look for the loose version
of a reference, check for a packed reference before giving up. This
fixes the failing test that was introduced two commits ago.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agocommit_ref(): if there is an empty dir in the way, delete it
Michael Haggerty [Thu, 5 May 2016 13:33:03 +0000 (15:33 +0200)]
commit_ref(): if there is an empty dir in the way, delete it

Part of the bug revealed in the last commit is that resolve_ref_unsafe()
incorrectly returns EISDIR if it finds a directory in the place where it
is looking for a loose reference, even if the corresponding packed
reference exists. lock_ref_sha1_basic() notices the bogus EISDIR, and
use it as an indication that it should call remove_empty_directories()
and call resolve_ref_unsafe() again.

But resolve_ref_unsafe() shouldn't report EISDIR in this case. If we
would simply make that change, then remove_empty_directories() wouldn't
get called anymore, and the empty directory would get in the way when
commit_ref() calls commit_lock_file() to rename the lockfile into place.

So instead of relying on lock_ref_sha1_basic() to delete empty
directories, teach commit_ref(), just before calling commit_lock_file(),
to check whether a directory is in the way, and if so, try to delete it.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agot1404: demonstrate a bug resolving references
Michael Haggerty [Thu, 5 May 2016 11:22:23 +0000 (13:22 +0200)]
t1404: demonstrate a bug resolving references

Add some tests checking that it is possible to work with a reference
even if there is an empty directory where the loose ref would be stored.

One of the new tests demonstrates a bug that has been with us since at
least 2.5.0--single reference lookup gives up when it sees the
directory, even if the reference exists as a packed ref. This probably
hasn't been reported before because Git usually cleans up empty
directories when packing references.

This bug will be fixed shortly.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
4 years agoSync with maint
Junio C Hamano [Mon, 25 Apr 2016 22:18:41 +0000 (15:18 -0700)]
Sync with maint

* maint:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"

4 years agoSeventh batch for post 2.8 cycle
Junio C Hamano [Mon, 25 Apr 2016 22:18:35 +0000 (15:18 -0700)]
Seventh batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'sb/submodule-path-misc-bugs'
Junio C Hamano [Mon, 25 Apr 2016 22:17:16 +0000 (15:17 -0700)]
Merge branch 'sb/submodule-path-misc-bugs'

"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.

* sb/submodule-path-misc-bugs:
  t7407: make expectation as clear as possible
  submodule update: test recursive path reporting from subdirectory
  submodule update: align reporting path for custom command execution
  submodule status: correct path handling in recursive submodules
  submodule update --init: correct path handling in recursive submodules
  submodule foreach: correct path display in recursive submodules

4 years agoMerge branch 'en/merge-trivial-fix'
Junio C Hamano [Mon, 25 Apr 2016 22:17:15 +0000 (15:17 -0700)]
Merge branch 'en/merge-trivial-fix'

When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.

* en/merge-trivial-fix:
  builtin/merge.c: fix a bug with trivial merges
  t7605: add a testcase demonstrating a bug with trivial merges

4 years agoMerge branch 'en/merge-octopus-fix'
Junio C Hamano [Mon, 25 Apr 2016 22:17:15 +0000 (15:17 -0700)]
Merge branch 'en/merge-octopus-fix'

"merge-octopus" strategy did not ensure that the index is clean
when merge begins.

* en/merge-octopus-fix:
  merge-octopus: abort if index does not match HEAD
  t6044: new merge testcases for when index doesn't match HEAD

4 years agoMerge branch 'dt/pre-refs-backend'
Junio C Hamano [Mon, 25 Apr 2016 22:17:15 +0000 (15:17 -0700)]
Merge branch 'dt/pre-refs-backend'

Code restructuring around the "refs" area to prepare for pluggable
refs backends.

* dt/pre-refs-backend: (24 commits)
  refs: on symref reflog expire, lock symref not referrent
  refs: move resolve_ref_unsafe into common code
  show_head_ref(): check the result of resolve_ref_namespace()
  check_aliased_update(): check that dst_name is non-NULL
  checkout_paths(): remove unneeded flag variable
  cmd_merge(): remove unneeded flag variable
  fsck_head_link(): remove unneeded flag variable
  read_raw_ref(): change flags parameter to unsigned int
  files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
  read_raw_ref(): manage own scratch space
  files-backend: break out ref reading
  resolve_ref_1(): eliminate local variable "bad_name"
  resolve_ref_1(): reorder code
  resolve_ref_1(): eliminate local variable
  resolve_ref_unsafe(): ensure flags is always set
  resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
  resolve_missing_loose_ref(): simplify semantics
  t1430: improve test coverage of deletion of badly-named refs
  t1430: test for-each-ref in the presence of badly-named refs
  t1430: don't rely on symbolic-ref for creating broken symrefs
  ...

4 years agoMerge branch 'jc/rerere-multi'
Junio C Hamano [Mon, 25 Apr 2016 22:17:14 +0000 (15:17 -0700)]
Merge branch 'jc/rerere-multi'

"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.

* jc/rerere-multi:
  rerere: adjust 'forget' to multi-variant world order
  rerere: split code to call ll_merge() further
  rerere: move code related to "forget" together
  rerere: gc and clear
  rerere: do use multiple variants
  t4200: rerere a merge with two identical conflicts
  rerere: allow multiple variants to exist
  rerere: delay the recording of preimage
  rerere: handle leftover rr-cache/$ID directory and postimage files
  rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
  rerere: split conflict ID further

4 years agoMerge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint
Junio C Hamano [Mon, 25 Apr 2016 20:36:26 +0000 (13:36 -0700)]
Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint

l10n-2.8.0-rnd3-fr

* tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"

4 years agoMerge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
Jiang Xin [Sun, 24 Apr 2016 12:36:34 +0000 (20:36 +0800)]
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint

* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"

4 years agoSixth batch for post 2.8 cycle
Junio C Hamano [Fri, 22 Apr 2016 22:48:03 +0000 (15:48 -0700)]
Sixth batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'ad/cygwin-wants-rename'
Junio C Hamano [Fri, 22 Apr 2016 22:45:10 +0000 (15:45 -0700)]
Merge branch 'ad/cygwin-wants-rename'

On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.

This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds.  It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853

($gmane/275680, $gmane/291853).

* ad/cygwin-wants-rename:
  config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES

4 years agoMerge branch 'jk/use-write-script-more'
Junio C Hamano [Fri, 22 Apr 2016 22:45:09 +0000 (15:45 -0700)]
Merge branch 'jk/use-write-script-more'

Code clean-up.

* jk/use-write-script-more:
  t3404: use write_script
  t1020: do not overuse printf and use write_script
  t5532: use write_script

4 years agoMerge branch 'jk/do-not-printf-NULL'
Junio C Hamano [Fri, 22 Apr 2016 22:45:09 +0000 (15:45 -0700)]
Merge branch 'jk/do-not-printf-NULL'

"git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.

* jk/do-not-printf-NULL:
  git_config_set_multivar_in_file: handle "unset" errors
  git_config_set_multivar_in_file: all non-zero returns are errors
  config: lower-case first word of error strings

4 years agoMerge branch 'jc/http-socks5h'
Junio C Hamano [Fri, 22 Apr 2016 22:45:09 +0000 (15:45 -0700)]
Merge branch 'jc/http-socks5h'

The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.

* jc/http-socks5h:
  http: differentiate socks5:// and socks5h://

4 years agoMerge branch 'ky/imap-send-openssl-1.1.0'
Junio C Hamano [Fri, 22 Apr 2016 22:45:08 +0000 (15:45 -0700)]
Merge branch 'ky/imap-send-openssl-1.1.0'

Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.

* ky/imap-send-openssl-1.1.0:
  configure: remove checking for HMAC_CTX_cleanup
  imap-send: avoid deprecated TLSv1_method()
  imap-send: check NULL return of SSL_CTX_new()
  imap-send: use HMAC() function provided by OpenSSL

4 years agoMerge branch 'ky/imap-send'
Junio C Hamano [Fri, 22 Apr 2016 22:45:08 +0000 (15:45 -0700)]
Merge branch 'ky/imap-send'

Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.

* ky/imap-send:
  imap-send: fix CRAM-MD5 response calculation
  imap-send: check for NOLOGIN capability only when using LOGIN command

4 years agoMerge branch 'jc/xstrfmt-null-with-prec-0'
Junio C Hamano [Fri, 22 Apr 2016 22:45:07 +0000 (15:45 -0700)]
Merge branch 'jc/xstrfmt-null-with-prec-0'

* jc/xstrfmt-null-with-prec-0:
  setup.c: do not feed NULL to "%.*s" even with precision 0

4 years agoMerge branch 'ad/commit-have-m-option'
Junio C Hamano [Fri, 22 Apr 2016 22:45:07 +0000 (15:45 -0700)]
Merge branch 'ad/commit-have-m-option'

"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.

* ad/commit-have-m-option:
  commit: do not ignore an empty message given by -m ''
  commit: --amend -m '' silently fails to wipe message

4 years agoMerge branch 'ew/send-email-drop-data-dumper'
Junio C Hamano [Fri, 22 Apr 2016 22:45:06 +0000 (15:45 -0700)]
Merge branch 'ew/send-email-drop-data-dumper'

Code clean-up.

* ew/send-email-drop-data-dumper:
  send-email: do not load Data::Dumper

4 years agoMerge branch 'ew/send-email-readable-message-id'
Junio C Hamano [Fri, 22 Apr 2016 22:45:05 +0000 (15:45 -0700)]
Merge branch 'ew/send-email-readable-message-id'

"git send-email" now uses a more readable timestamps when
formulating a message ID.

* ew/send-email-readable-message-id:
  send-email: more meaningful Message-ID

4 years agoMerge branch 'sb/submodule-helper-clone-regression-fix'
Junio C Hamano [Fri, 22 Apr 2016 22:45:03 +0000 (15:45 -0700)]
Merge branch 'sb/submodule-helper-clone-regression-fix'

A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident.  This has
been corrected.

* sb/submodule-helper-clone-regression-fix:
  submodule--helper, module_clone: catch fprintf failure
  submodule--helper: do not borrow absolute_path() result for too long
  submodule--helper, module_clone: always operate on absolute paths
  submodule--helper clone: create the submodule path just once
  submodule--helper: fix potential NULL-dereference
  recursive submodules: test for relative paths

5 years agoFifth batch for post 2.8 cycle
Junio C Hamano [Mon, 18 Apr 2016 17:51:09 +0000 (10:51 -0700)]
Fifth batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'jk/branch-shortening-funny-symrefs'
Junio C Hamano [Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)]
Merge branch 'jk/branch-shortening-funny-symrefs'

A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).

* jk/branch-shortening-funny-symrefs:
  branch: fix shortening of non-remote symrefs

5 years agoMerge branch 'ky/branch-m-worktree'
Junio C Hamano [Mon, 18 Apr 2016 17:48:11 +0000 (10:48 -0700)]
Merge branch 'ky/branch-m-worktree'

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
  set_worktree_head_symref(): fix error message
  branch -m: update all per-worktree HEADs
  refs: add a new function set_worktree_head_symref

5 years agoMerge branch 'maint'
Junio C Hamano [Fri, 15 Apr 2016 01:59:09 +0000 (18:59 -0700)]
Merge branch 'maint'

* maint:
  Prepare for 2.8.2
  Start preparing for 2.8.2

5 years agoPrepare for 2.8.2
Junio C Hamano [Fri, 15 Apr 2016 01:58:11 +0000 (18:58 -0700)]
Prepare for 2.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'jv/merge-nothing-into-void' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)]
Merge branch 'jv/merge-nothing-into-void' into maint

"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).

* jv/merge-nothing-into-void:
  merge: fix NULL pointer dereference when merging nothing into void

5 years agoMerge branch 'ss/commit-squash-msg' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:48 +0000 (18:57 -0700)]
Merge branch 'ss/commit-squash-msg' into maint

When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.

* ss/commit-squash-msg:
  commit: do not lose SQUASH_MSG contents

5 years agoMerge branch 'jk/send-email-rtrim-mailrc-alias' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)]
Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint

"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.

* jk/send-email-rtrim-mailrc-alias:
  send-email: ignore trailing whitespace in mailrc alias file

5 years agoMerge branch 'da/mergetool-delete-delete-conflict' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)]
Merge branch 'da/mergetool-delete-delete-conflict' into maint

"git mergetool" did not work well with conflicts that both sides
deleted.

* da/mergetool-delete-delete-conflict:
  mergetool: honor tempfile configuration when resolving delete conflicts
  mergetool: support delete/delete conflicts

5 years agoMerge branch 'jk/startup-info' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)]
Merge branch 'jk/startup-info' into maint

The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.

* jk/startup-info:
  use setup_git_directory() in test-* programs
  grep: turn off gitlink detection for --no-index
  mailmap: do not resolve blobs in a non-repository
  remote: don't resolve HEAD in non-repository
  setup: set startup_info->have_repository more reliably
  setup: make startup_info available everywhere

5 years agoMerge branch 'jk/getwholeline-getdelim-empty' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)]
Merge branch 'jk/getwholeline-getdelim-empty' into maint

strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.

* jk/getwholeline-getdelim-empty:
  strbuf_getwholeline: NUL-terminate getdelim buffer on error

5 years agoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:45 +0000 (18:57 -0700)]
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint

A small memory leak in an error codepath has been plugged in xdiff
code.

* rj/xdiff-prepare-plug-leak-on-error-codepath:
  xdiff/xprepare: fix a memory leak
  xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

5 years agoMerge branch 'gf/fetch-pack-direct-object-fetch' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:44 +0000 (18:57 -0700)]
Merge branch 'gf/fetch-pack-direct-object-fetch' into maint

Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.

* gf/fetch-pack-direct-object-fetch:
  fetch-pack: update the documentation for "<refs>..." arguments
  fetch-pack: fix object_id of exact sha1

5 years agoMerge branch 'jk/rev-parse-local-env-vars' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:44 +0000 (18:57 -0700)]
Merge branch 'jk/rev-parse-local-env-vars' into maint

The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.

* jk/rev-parse-local-env-vars:
  rev-parse: let some options run outside repository
  t1515: add tests for rev-parse out-of-repo helpers

5 years agoMerge branch 'jk/config-get-urlmatch' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:43 +0000 (18:57 -0700)]
Merge branch 'jk/config-get-urlmatch' into maint

"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.

* jk/config-get-urlmatch:
  Documentation/git-config: fix --get-all description
  Documentation/git-config: use bulleted list for exit codes
  config: fail if --get-urlmatch finds no value

5 years agoMerge branch 'pb/t7502-drop-dup' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:18 +0000 (18:37 -0700)]
Merge branch 'pb/t7502-drop-dup' into maint

Code clean-up.

* pb/t7502-drop-dup:
  t/t7502 : drop duplicate test

5 years agoMerge branch 'jk/test-httpd-config-nosystem' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:17 +0000 (18:37 -0700)]
Merge branch 'jk/test-httpd-config-nosystem' into maint

The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.

* jk/test-httpd-config-nosystem:
  t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env

5 years agoMerge branch 'sb/clone-t57-t56' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:16 +0000 (18:37 -0700)]
Merge branch 'sb/clone-t57-t56' into maint

Rename bunch of tests on "git clone" for better organization.

* sb/clone-t57-t56:
  clone tests: rename t57* => t56*

5 years agoMerge branch 'jk/credential-cache-comment-exit' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:16 +0000 (18:37 -0700)]
Merge branch 'jk/credential-cache-comment-exit' into maint

A code clarification.

* jk/credential-cache-comment-exit:
  credential-cache--daemon: clarify "exit" action semantics

5 years agoMerge branch 'jc/index-pack' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)]
Merge branch 'jc/index-pack' into maint

Code clean-up.

* jc/index-pack:
  index-pack: add a helper function to derive .idx/.keep filename
  index-pack: correct --keep[=<msg>]

5 years agoMerge branch 'ss/exc-flag-is-a-collection-of-bits' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)]
Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint

Code clean-up.

* ss/exc-flag-is-a-collection-of-bits:
  dir: store EXC_FLAG_* values in unsigned integers

5 years agoMerge branch 'mp/upload-pack-use-embedded-args' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)]
Merge branch 'mp/upload-pack-use-embedded-args' into maint

The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.

* mp/upload-pack-use-embedded-args:
  upload-pack: use argv_array for pack_objects

5 years agoMerge branch 'oa/doc-diff-check' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)]
Merge branch 'oa/doc-diff-check' into maint

A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers

5 years agoMerge branch 'pb/opt-cmdmode-doc' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)]
Merge branch 'pb/opt-cmdmode-doc' into maint

Minor API documentation update.

* pb/opt-cmdmode-doc:
  api-parse-options.txt: document OPT_CMDMODE()

5 years agoMerge branch 'nd/apply-doc' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)]
Merge branch 'nd/apply-doc' into maint

A minor documentation update.

* nd/apply-doc:
  git-apply.txt: mention the behavior inside a subdir
  git-apply.txt: remove a space

5 years agoMerge branch 'cc/doc-recommend-performance-trace-to-file' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)]
Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint

A minor documentation update.

* cc/doc-recommend-performance-trace-to-file:
  Documentation: talk about pager in api-trace.txt

5 years agoMerge branch 'mm/lockfile-error-message' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)]
Merge branch 'mm/lockfile-error-message' into maint

* mm/lockfile-error-message:
  lockfile: improve error message when lockfile exists
  lockfile: mark strings for translation

5 years agoStart preparing for 2.8.2
Junio C Hamano [Wed, 13 Apr 2016 23:30:00 +0000 (16:30 -0700)]
Start preparing for 2.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoimap-send: fix CRAM-MD5 response calculation
Kazuki Yamaguchi [Fri, 8 Apr 2016 14:02:30 +0000 (23:02 +0900)]
imap-send: fix CRAM-MD5 response calculation

Remove extra + 1 from resp_len, the length of the byte sequence to be
Base64 encoded and passed to the server as the response. Or the response
incorrectly contains an extra \0.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoimap-send: check for NOLOGIN capability only when using LOGIN command
Kazuki Yamaguchi [Fri, 8 Apr 2016 14:02:24 +0000 (23:02 +0900)]
imap-send: check for NOLOGIN capability only when using LOGIN command

Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod
is specified.

LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should
be allowed, or we can't connect to IMAP servers which only accepts
AUTHENTICATE command.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoFourth batch for post 2.8 cycle
Junio C Hamano [Wed, 13 Apr 2016 21:19:29 +0000 (14:19 -0700)]
Fourth batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'
Junio C Hamano [Wed, 13 Apr 2016 21:12:40 +0000 (14:12 -0700)]
Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'

When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion.  It has been
corrected.

* tb/blame-force-read-cache-to-workaround-safe-crlf:
  correct blame for files commited with CRLF

5 years agoMerge branch 'mg/complete-cherry-mark-to-log'
Junio C Hamano [Wed, 13 Apr 2016 21:12:39 +0000 (14:12 -0700)]
Merge branch 'mg/complete-cherry-mark-to-log'

The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".

* mg/complete-cherry-mark-to-log:
  completion: complete --cherry-mark for git log

5 years agoMerge branch 'ep/trace-doc-sample-fix'
Junio C Hamano [Wed, 13 Apr 2016 21:12:38 +0000 (14:12 -0700)]
Merge branch 'ep/trace-doc-sample-fix'

Fix a typo in an example in the trace API documentation.

* ep/trace-doc-sample-fix:
  api-trace.txt: fix typo

5 years agoMerge branch 'jc/makefile-redirection-stderr'
Junio C Hamano [Wed, 13 Apr 2016 21:12:37 +0000 (14:12 -0700)]
Merge branch 'jc/makefile-redirection-stderr'

A minor fix in the Makefile.

* jc/makefile-redirection-stderr:
  Makefile: fix misdirected redirections

5 years agoMerge branch 'lt/pretty-expand-tabs'
Junio C Hamano [Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)]
Merge branch 'lt/pretty-expand-tabs'

When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended.  The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.

* lt/pretty-expand-tabs:
  pretty: test --expand-tabs
  pretty: allow tweaking tabwidth in --expand-tabs
  pretty: enable --expand-tabs by default for selected pretty formats
  pretty: expand tabs in indented logs to make things line up properly

5 years agoMerge branch 'mj/pull-rebase-autostash'
Junio C Hamano [Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)]
Merge branch 'mj/pull-rebase-autostash'

"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.

* mj/pull-rebase-autostash:
  t5520: test --[no-]autostash with pull.rebase=true
  t5520: reduce commom lines of code
  t5520: factor out common "failing autostash" code
  t5520: factor out common "successful autostash" code
  t5520: use better test to check stderr output
  t5520: ensure consistent test conditions
  t5520: use consistent capitalization in test titles
  pull --rebase: add --[no-]autostash flag
  git-pull.c: introduce git_pull_config()