git/git.git
4 years agoworktree.c: get_worktrees() takes a new flag argument
Nguyễn Thái Ngọc Duy [Mon, 28 Nov 2016 09:36:55 +0000 (16:36 +0700)]
worktree.c: get_worktrees() takes a new flag argument

This is another no-op patch, in preparation for get_worktrees() to do
optional things, like sorting.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoget_worktrees() must return main worktree as first item even on error
Nguyễn Thái Ngọc Duy [Mon, 28 Nov 2016 09:36:54 +0000 (16:36 +0700)]
get_worktrees() must return main worktree as first item even on error

This is required by git-worktree.txt, stating that the main worktree is
the first line (especially in --porcelain mode when we can't just change
behavior at will).

There's only one case when get_worktrees() may skip main worktree, when
parse_ref() fails. Update the code so that we keep first item as main
worktree and return something sensible in this case:

 - In user-friendly mode, since we're not constraint by anything,
   returning "(error)" should do the job (we already show "(detached
   HEAD)" which is not machine-friendly). Actually errors should be
   printed on stderr by parse_ref() (*)

 - In plumbing mode, we do not show neither 'bare', 'detached' or
   'branch ...', which is possible by the format description if I read
   it right.

Careful readers may realize that when the local variable "head_ref" in
get_main_worktree() is emptied, add_head_info() will do nothing to
wt->head_sha1. But that's ok because head_sha1 is zero-ized in the
previous patch.

(*) Well, it does not. But it's supposed to be a stop gap implementation
    until we can reuse refs code to parse "ref: " stuff in HEAD, from
    resolve_refs_unsafe(). Now may be the time since refs refactoring is
    mostly done.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoworktree: reorder an if statement
Nguyễn Thái Ngọc Duy [Mon, 28 Nov 2016 09:36:53 +0000 (16:36 +0700)]
worktree: reorder an if statement

This is no-op. But it helps reduce diff noise in the next patch.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoworktree.c: zero new 'struct worktree' on allocation
Nguyễn Thái Ngọc Duy [Tue, 22 Nov 2016 10:00:44 +0000 (17:00 +0700)]
worktree.c: zero new 'struct worktree' on allocation

This keeps things a bit simpler when we add more fields, knowing that
default values are always zero.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po
Junio C Hamano [Tue, 22 Nov 2016 22:16:06 +0000 (14:16 -0800)]
Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po

l10n-2.11.0-rnd2

* tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: Fixed typo of git fetch-pack command
  l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)
  l10n: zh_CN: for git v2.11.0 l10n round 1
  l10n: pt_PT: update Portuguese translation
  l10n: fr.po fix grammar mistakes
  l10n: fr.po v2.11.0_rnd1
  l10n: sv.po: Update Swedish translation (2913t0f0u)
  l10n: vi.po: Updated translation to v2.11.0 (2913t)
  l10n: ko.po: Update Korean translation
  l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
  l10n: ru.po: update Russian translation

4 years agoMerge branch 'js/prepare-sequencer'
Junio C Hamano [Tue, 22 Nov 2016 22:15:38 +0000 (14:15 -0800)]
Merge branch 'js/prepare-sequencer'

Fix for an error message string.

* js/prepare-sequencer:
  i18n: fix unmatched single quote in error message

4 years agol10n: Fixed typo of git fetch-pack command
Jiang Xin [Tue, 22 Nov 2016 14:24:59 +0000 (22:24 +0800)]
l10n: Fixed typo of git fetch-pack command

Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed
the affected translations all in one batch.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
4 years agol10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)
Jiang Xin [Tue, 22 Nov 2016 14:22:59 +0000 (22:22 +0800)]
l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)

Generate po/git.pot from v2.11.0-rc2 for git v2.11.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
4 years agoMerge branch 'master' of git://github.com/git-l10n/git-po
Jiang Xin [Tue, 22 Nov 2016 14:08:47 +0000 (22:08 +0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: for git v2.11.0 l10n round 1
  l10n: pt_PT: update Portuguese translation
  l10n: fr.po fix grammar mistakes
  l10n: fr.po v2.11.0_rnd1
  l10n: sv.po: Update Swedish translation (2913t0f0u)
  l10n: vi.po: Updated translation to v2.11.0 (2913t)
  l10n: ko.po: Update Korean translation
  l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
  l10n: ru.po: update Russian translation

4 years agoi18n: fix unmatched single quote in error message
Jiang Xin [Sun, 20 Nov 2016 12:26:17 +0000 (20:26 +0800)]
i18n: fix unmatched single quote in error message

Fixed unmatched single quote introduced by commit:

 * f56fffef9a sequencer: teach write_message() to append an optional LF

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agol10n: zh_CN: for git v2.11.0 l10n round 1
Jiang Xin [Thu, 27 Oct 2016 13:53:37 +0000 (21:53 +0800)]
l10n: zh_CN: for git v2.11.0 l10n round 1

Update 209 translations (2913t0f0u) for git v2.11.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
4 years agoGit 2.11-rc2 v2.11.0-rc2
Junio C Hamano [Thu, 17 Nov 2016 21:47:36 +0000 (13:47 -0800)]
Git 2.11-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'tk/diffcore-delta-remove-unused'
Junio C Hamano [Thu, 17 Nov 2016 21:45:22 +0000 (13:45 -0800)]
Merge branch 'tk/diffcore-delta-remove-unused'

Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()

4 years agoMerge branch 'jk/create-branch-remove-unused-param'
Junio C Hamano [Thu, 17 Nov 2016 21:45:21 +0000 (13:45 -0800)]
Merge branch 'jk/create-branch-remove-unused-param'

Code clean-up.

* jk/create-branch-remove-unused-param:
  create_branch: drop unused "head" parameter

4 years agoMerge branch 'nd/worktree-lock'
Junio C Hamano [Thu, 17 Nov 2016 21:45:21 +0000 (13:45 -0800)]
Merge branch 'nd/worktree-lock'

Typofix.

* nd/worktree-lock:
  git-worktree.txt: fix typo "to"/"two", and add comma

4 years agodiffcore-delta: remove unused parameter to diffcore_count_changes()
Tobias Klauser [Mon, 14 Nov 2016 13:39:05 +0000 (14:39 +0100)]
diffcore-delta: remove unused parameter to diffcore_count_changes()

The delta_limit parameter to diffcore_count_changes() has been unused
since commit ba23bbc8e ("diffcore-delta: make change counter to byte
oriented again.", 2006-03-04).

Remove the parameter and adjust all callers.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agogit-worktree.txt: fix typo "to"/"two", and add comma
Ben North [Sat, 12 Nov 2016 08:55:16 +0000 (08:55 +0000)]
git-worktree.txt: fix typo "to"/"two", and add comma

Signed-off-by: Ben North <ben@redfrontdoor.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agol10n: pt_PT: update Portuguese translation
Vasco Almeida [Sun, 6 Nov 2016 13:04:01 +0000 (12:04 -0100)]
l10n: pt_PT: update Portuguese translation

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
4 years agoGit 2.11.0-rc1 v2.11.0-rc1
Junio C Hamano [Fri, 11 Nov 2016 22:04:32 +0000 (14:04 -0800)]
Git 2.11.0-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'rt/fetch-pack-error-message-fix'
Junio C Hamano [Fri, 11 Nov 2016 21:56:31 +0000 (13:56 -0800)]
Merge branch 'rt/fetch-pack-error-message-fix'

An error message in fetch-pack executable that was newly marked for
translation was misspelt, which has been fixed.

* rt/fetch-pack-error-message-fix:
  fetch-pack.c: correct command at the beginning of an error message

4 years agoMerge branch 'ps/common-info-doc'
Junio C Hamano [Fri, 11 Nov 2016 21:56:31 +0000 (13:56 -0800)]
Merge branch 'ps/common-info-doc'

Doc fix.

* ps/common-info-doc:
  doc: fix location of 'info/' with $GIT_COMMON_DIR

4 years agoMerge branch 'js/pwd-var-vs-pwd-cmd-fix'
Junio C Hamano [Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)]
Merge branch 'js/pwd-var-vs-pwd-cmd-fix'

Last minute fixes to two fixups merged to 'master' recently.

* js/pwd-var-vs-pwd-cmd-fix:
  t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

4 years agoMerge branch 'ls/macos-update'
Junio C Hamano [Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)]
Merge branch 'ls/macos-update'

Portability update and workaround for builds on recent Mac OS X.

* ls/macos-update:
  travis-ci: disable GIT_TEST_HTTPD for macOS
  Makefile: set NO_OPENSSL on macOS by default

4 years agoMerge branch 'js/prepare-sequencer'
Junio C Hamano [Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)]
Merge branch 'js/prepare-sequencer'

Silence a clang warning introduced by a recently graduated topic.

* js/prepare-sequencer:
  sequencer: silence -Wtautological-constant-out-of-range-compare

4 years agoMerge branch 'ls/filter-process'
Junio C Hamano [Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)]
Merge branch 'ls/filter-process'

Test portability improvements and optimization for an
already-graduated topic.

* ls/filter-process:
  t0021: remove debugging cruft

4 years agoMerge branch 'as/merge-attr-sleep'
Junio C Hamano [Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)]
Merge branch 'as/merge-attr-sleep'

Fix for a racy false-positive test failure.

* as/merge-attr-sleep:
  t6026: clarify the point of "kill $(cat sleep.pid)"
  t6026: ensure that long-running script really is
  Revert "t6026-merge-attr: don't fail if sleep exits early"
  Revert "t6026-merge-attr: ensure that the merge driver was called"
  t6026-merge-attr: ensure that the merge driver was called
  t6026-merge-attr: don't fail if sleep exits early

4 years agofetch-pack.c: correct command at the beginning of an error message
Ralf Thielow [Fri, 11 Nov 2016 17:21:00 +0000 (18:21 +0100)]
fetch-pack.c: correct command at the beginning of an error message

One error message in fetch-pack.c uses 'git fetch_pack' at the beginning
which is not a git command.  Use 'git fetch-pack' instead.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot0021: remove debugging cruft
Junio C Hamano [Fri, 11 Nov 2016 21:07:37 +0000 (13:07 -0800)]
t0021: remove debugging cruft

The redirection of the standard error stream to a temporary file is
a leftover cruft during debugging.  Remove it.

Besides, it is reported by folks on the Windows that the test is
flaky with this redirection; somebody gets confused and this
merely-redirected-to file gets marked as delete-pending by git.exe
and makes it finish with a non-zero exit status when "git checkout"
finishes.  Windows folks may want to figure that one out, but for
the purpose of this test, it shouldn't become a show-stopper.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot6026: clarify the point of "kill $(cat sleep.pid)"
Johannes Sixt [Fri, 11 Nov 2016 20:24:44 +0000 (21:24 +0100)]
t6026: clarify the point of "kill $(cat sleep.pid)"

We lengthened the time the leftover process sleeps in the previous
commit to make sure it will be there while 'git merge' runs and
finishes.  It therefore needs to be killed before leaving the test.
And it needs to be killed even when 'git merge' fails, so it has to
be triggered via test_when_finished mechanism.

Explain all that in a large comment, and move the use site of
test_when_finished to immediately before 'git merge' invocation,
where the process is spawned.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables
Johannes Sixt [Fri, 11 Nov 2016 17:31:48 +0000 (18:31 +0100)]
t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

We have to use $PWD instead of $(pwd) because on Windows the latter
would add a C: style path to bash's Unix-style $PATH variable, which
becomes confused by the colon after the drive letter. ($PWD is a
Unix-style path.)

In the case of GIT_ALTERNATE_OBJECT_DIRECTORIES, bash on Windows
assembles a Unix-style path list with the colon as separators. It
converts the value to a Windows-style path list with the semicolon as
path separator when it forwards the variable to git.exe. The same
confusion happens when bash's original value is contaminated with
Windows style paths.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agodoc: fix location of 'info/' with $GIT_COMMON_DIR
Patrick Steinhardt [Fri, 11 Nov 2016 11:23:32 +0000 (12:23 +0100)]
doc: fix location of 'info/' with $GIT_COMMON_DIR

With the introduction of the $GIT_COMMON_DIR variable, the
repository layout manual was changed to reflect the location for
many files in case the variable is set. While adding the new
locations, one typo snuck in regarding the location of the
'info/' folder, which is falsely claimed to reside at
"$GIT_COMMON_DIR/index".

Fix the typo to point to "$GIT_COMMON_DIR/info/" instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot6026: ensure that long-running script really is
Johannes Schindelin [Wed, 9 Nov 2016 13:51:22 +0000 (14:51 +0100)]
t6026: ensure that long-running script really is

When making sure that background tasks are cleaned up in 5babb5b
(t6026-merge-attr: clean up background process at end of test case,
2016-09-07), we considered to let the background task sleep longer, just
to be certain that it will still be running when we want to kill it
after the test.

Sadly, the assumption appears not to hold true that the test case passes
quickly enough to kill the background task within a second.

Simply increase it to an hour. No system can be possibly slow enough to
make above-mentioned assumption incorrect.

Reported by Andreas Schwab.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoRevert "t6026-merge-attr: don't fail if sleep exits early"
Junio C Hamano [Thu, 10 Nov 2016 23:55:13 +0000 (15:55 -0800)]
Revert "t6026-merge-attr: don't fail if sleep exits early"

This reverts commit 734fde2d7167e4b20d2ff6062ade3846949b0741.

The point of the test is that the stray process was still running
when 'git merge' did its thing through its completion, so a failure
to "kill" it means we didn't give a condition to the test to trigger
a possible future breakage.  Appending "|| :" to the "kill" is
sweeping a test-bug under the rug.

4 years agoRevert "t6026-merge-attr: ensure that the merge driver was called"
Junio C Hamano [Thu, 10 Nov 2016 23:54:12 +0000 (15:54 -0800)]
Revert "t6026-merge-attr: ensure that the merge driver was called"

This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.

We are not interested in the stray process in the merge driver
started; we want it to be still around.

4 years agoMerge branch 'jk/alt-odb-cleanup'
Junio C Hamano [Thu, 10 Nov 2016 21:17:30 +0000 (13:17 -0800)]
Merge branch 'jk/alt-odb-cleanup'

Fix a corner-case regression in a topic that graduated during the
v2.11 cycle.

* jk/alt-odb-cleanup:
  alternates: re-allow relative paths from environment

4 years agoMerge branch 'jk/filter-process-fix'
Junio C Hamano [Thu, 10 Nov 2016 21:17:30 +0000 (13:17 -0800)]
Merge branch 'jk/filter-process-fix'

Test portability improvements and cleanups for t0021.

* jk/filter-process-fix:
  t0021: fix filehandle usage on older perl
  t0021: use $PERL_PATH for rot13-filter.pl
  t0021: put $TEST_ROOT in $PATH
  t0021: use write_script to create rot13 shell script

4 years agoMerge branch 'ls/filter-process'
Junio C Hamano [Thu, 10 Nov 2016 21:17:30 +0000 (13:17 -0800)]
Merge branch 'ls/filter-process'

Test portability improvements and optimization for an
already-graduated topic.

* ls/filter-process:
  t0021: compute file size with a single process instead of a pipeline
  t0021: expect more variations in the output of uniq -c

4 years agot6026-merge-attr: ensure that the merge driver was called
Andreas Schwab [Thu, 10 Nov 2016 08:31:18 +0000 (09:31 +0100)]
t6026-merge-attr: ensure that the merge driver was called

Explicitly check for the existence of the pid file to test that the
merge driver was actually called.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agotravis-ci: disable GIT_TEST_HTTPD for macOS
Lars Schneider [Mon, 17 Oct 2016 00:25:50 +0000 (17:25 -0700)]
travis-ci: disable GIT_TEST_HTTPD for macOS

TravisCI changed their default macOS image from 10.10 to 10.11 [1].
Unfortunately the HTTPD tests do not run out of the box using the
pre-installed Apache web server anymore. Therefore we enable these
tests only for Linux and disable them for macOS.

[1] https://blog.travis-ci.com/2016-10-04-osx-73-default-image-live/

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMakefile: set NO_OPENSSL on macOS by default
Lars Schneider [Sun, 6 Nov 2016 19:35:04 +0000 (20:35 +0100)]
Makefile: set NO_OPENSSL on macOS by default

Apple removed the OpenSSL header files in macOS 10.11 and above. OpenSSL
was deprecated since macOS 10.7.

Set `NO_OPENSSL` and `APPLE_COMMON_CRYPTO` to `YesPlease` as default for
macOS. It is possible to override this and use OpenSSL by defining
`NO_APPLE_COMMON_CRYPTO`.

Original-patch-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agocreate_branch: drop unused "head" parameter
Jeff King [Fri, 4 Nov 2016 16:30:12 +0000 (12:30 -0400)]
create_branch: drop unused "head" parameter

This function used to have the caller pass in the current
value of HEAD, in order to make sure we didn't clobber HEAD.
In 55c4a6730, that logic moved to validate_new_branchname(),
which just resolves HEAD itself. The parameter to
create_branch is now unused.

Since we have to update and re-wrap the docstring describing
the parameters anyway, let's take this opportunity to break
it out into a list, which makes it easier to find the
parameters.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git
Jiang Xin [Wed, 9 Nov 2016 14:54:19 +0000 (22:54 +0800)]
Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git

* 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git:
  l10n: fr.po fix grammar mistakes
  l10n: fr.po v2.11.0_rnd1

4 years agosequencer: silence -Wtautological-constant-out-of-range-compare
Jeff King [Wed, 9 Nov 2016 03:57:28 +0000 (22:57 -0500)]
sequencer: silence -Wtautological-constant-out-of-range-compare

When clang compiles sequencer.c, it complains:

  sequencer.c:632:14: warning: comparison of constant 2 with
    expression of type 'const enum todo_command' is always
    true [-Wtautological-constant-out-of-range-compare]
          if (command < ARRAY_SIZE(todo_command_strings))

This is because "command" is an enum that may only have two
values (0 and 1) and the array in question has two elements.

As it turns out, clang is actually wrong here, at least
according to its own bug tracker:

  https://llvm.org/bugs/show_bug.cgi?id=16154

But it's still worth working around this, as the warning is
present with -Wall, meaning we fail compilation with "make
DEVELOPER=1".

Casting the enum to size_t sufficiently unconfuses clang. As
a bonus, it also catches any possible out-of-bounds access
if the enum takes on a negative value (which shouldn't
happen either, but again, this is a defensive check).

Signed-off-by: Jeff King <peff@peff.net>
4 years agot6026-merge-attr: don't fail if sleep exits early
Andreas Schwab [Tue, 8 Nov 2016 17:03:04 +0000 (18:03 +0100)]
t6026-merge-attr: don't fail if sleep exits early

Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end
of test case") added a kill command to clean up after the test, but this
can fail if the sleep command exits before the cleanup is executed.
Ignore the error from the kill command.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Jeff King <peff@peff.net>
4 years agoalternates: re-allow relative paths from environment
Jeff King [Tue, 8 Nov 2016 04:50:17 +0000 (23:50 -0500)]
alternates: re-allow relative paths from environment

Commit 670c359da (link_alt_odb_entry: handle normalize_path
errors, 2016-10-03) regressed the handling of relative paths
in the GIT_ALTERNATE_OBJECT_DIRECTORIES variable. It's not
entirely clear this was ever meant to work, but it _has_
worked for several years, so this commit restores the
original behavior.

When we get a path in GIT_ALTERNATE_OBJECT_DIRECTORIES, we
add it the path to the list of alternate object directories
as if it were found in objects/info/alternates, but with one
difference: we do not provide the link_alt_odb_entry()
function with a base for relative paths. That function
doesn't turn it into an absolute path, and we end up feeding
the relative path to the strbuf_normalize_path() function.

Most relative paths break out of the top-level directory
(e.g., "../foo.git/objects"), and thus normalizing fails.
Prior to 670c359da, we simply ignored the error, and due to
the way normalize_path_copy() was implemented it happened to
return the original path in this case. We then accessed the
alternate objects using this relative path.

By storing the relative path in the alt_odb list, the path
is relative to wherever we happen to be at the time we do an
object lookup. That means we look from $GIT_DIR in a bare
repository, and from the top of the worktree in a non-bare
repository.

If this were being designed from scratch, it would make
sense to pick a stable location (probably $GIT_DIR, or even
the object directory) and use that as the relative base,
turning the result into an absolute path.  However, given
the history, at this point the minimal fix is to match the
pre-670c359da behavior.

We can do this simply by ignoring the error when we have no
relative base and using the original value (which we now
reliably have, thanks to strbuf_normalize_path()).

That still leaves us with a relative path that foils our
duplicate detection, and may act strangely if we ever
chdir() later in the process. We could solve that by storing
an absolute path based on getcwd(). That may be a good
future direction; for now we'll do just the minimum to fix
the regression.

The new t5615 script demonstrates the fix in its final three
tests. Since we didn't have any tests of the alternates
environment variable at all, it also adds some tests of
absolute paths.

Reported-by: Bryan Turner <bturner@atlassian.com>
Signed-off-by: Jeff King <peff@peff.net>
4 years agot0021: compute file size with a single process instead of a pipeline
Johannes Sixt [Sun, 6 Nov 2016 19:31:19 +0000 (20:31 +0100)]
t0021: compute file size with a single process instead of a pipeline

Avoid unwanted coding patterns (prodigal use of pipelines), and in
particular a useless use of cat.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jeff King <peff@peff.net>
4 years agot0021: expect more variations in the output of uniq -c
Johannes Sixt [Thu, 3 Nov 2016 20:12:13 +0000 (21:12 +0100)]
t0021: expect more variations in the output of uniq -c

Some versions of uniq -c write the count left-justified, other version
write it right-justified. Be prepared for both kinds.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jeff King <peff@peff.net>
4 years agol10n: fr.po fix grammar mistakes
jfbu [Sun, 6 Nov 2016 10:10:50 +0000 (11:10 +0100)]
l10n: fr.po fix grammar mistakes

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: jfbu <jfbu@free.fr>
4 years agol10n: fr.po v2.11.0_rnd1
Jean-Noel Avila [Sat, 5 Nov 2016 20:43:53 +0000 (21:43 +0100)]
l10n: fr.po v2.11.0_rnd1

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
4 years agol10n: sv.po: Update Swedish translation (2913t0f0u)
Peter Krefting [Sat, 5 Nov 2016 15:02:45 +0000 (16:02 +0100)]
l10n: sv.po: Update Swedish translation (2913t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
4 years agoMerge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko
Jiang Xin [Sat, 5 Nov 2016 12:09:16 +0000 (20:09 +0800)]
Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko

* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko:
  l10n: ko.po: Update Korean translation

4 years agol10n: vi.po: Updated translation to v2.11.0 (2913t)
Tran Ngoc Quan [Fri, 4 Nov 2016 01:12:04 +0000 (08:12 +0700)]
l10n: vi.po: Updated translation to v2.11.0 (2913t)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
4 years agol10n: ko.po: Update Korean translation
Changwoo Ryu [Thu, 3 Nov 2016 15:38:23 +0000 (00:38 +0900)]
l10n: ko.po: Update Korean translation

Signed-off-by: Changwoo Ryu <cwryu@debian.org>
4 years agot0021: fix filehandle usage on older perl
Jeff King [Wed, 2 Nov 2016 18:23:01 +0000 (14:23 -0400)]
t0021: fix filehandle usage on older perl

The rot13-filter.pl script calls methods on implicitly
defined filehandles (STDOUT, and the result of an open()
call).  Prior to perl 5.13, these methods are not
automatically loaded, and perl will complain with:

  Can't locate object method "flush" via package "IO::Handle"

Let's explicitly load IO::File (which inherits from
IO::Handle). That's more than we need for just "flush", but
matches what perl has done since:

  http://perl5.git.perl.org/perl.git/commit/15e6cdd91beb4cefae4b65e855d68cf64766965d

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot0021: use $PERL_PATH for rot13-filter.pl
Jeff King [Wed, 2 Nov 2016 18:20:22 +0000 (14:20 -0400)]
t0021: use $PERL_PATH for rot13-filter.pl

The rot13-filter.pl script hardcodes "#!/usr/bin/perl", and
does not respect $PERL_PATH at all. That is a problem if the
system does not have perl at that path, or if it has a perl
that is too old to run a complicated script like the
rot13-filter (but PERL_PATH points to a more modern one).

We can fix this by using write_script() to create a new copy
of the script with the correct #!-line. In theory we could
move the whole script inside t0021-conversion.sh rather than
having it as an auxiliary file, but it's long enough that
it just makes things harder to read.

As a bonus, we can stop using the full path to the script in
the filter-process config we add (because the trash
directory is in our PATH). Not only is this shorter, but it
sidesteps any shell-quoting issues. The original was broken
when $TEST_DIRECTORY contained a space, because it was
interpolated in the outer script.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot0021: put $TEST_ROOT in $PATH
Jeff King [Wed, 2 Nov 2016 18:18:25 +0000 (14:18 -0400)]
t0021: put $TEST_ROOT in $PATH

We create a rot13.sh script in the trash directory, but need
to call it by its full path when we have moved our cwd to
another directory. Let's just put $TEST_ROOT in our $PATH so
that the script is always found.

This is a minor convenience for rot13.sh, but will be a
major one when we switch rot13-filter.pl to a script in the
same directory, as it means we will not have to deal with
shell quoting inside the filter-process config.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot0021: use write_script to create rot13 shell script
Jeff King [Wed, 2 Nov 2016 18:17:51 +0000 (14:17 -0400)]
t0021: use write_script to create rot13 shell script

This avoids us fooling around with $SHELL_PATH and the
executable bit ourselves.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru
Jiang Xin [Wed, 2 Nov 2016 14:03:05 +0000 (22:03 +0800)]
Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation

4 years agoA bit of updates post -rc0
Junio C Hamano [Tue, 1 Nov 2016 19:59:58 +0000 (12:59 -0700)]
A bit of updates post -rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'cc/split-index-typofix'
Junio C Hamano [Tue, 1 Nov 2016 19:58:49 +0000 (12:58 -0700)]
Merge branch 'cc/split-index-typofix'

Typofix in a comment in code

* cc/split-index-typofix:
  split-index: s/eith/with/ typo fix

4 years agoMerge branch 'jk/no-looking-at-dotgit-outside-repo'
Junio C Hamano [Tue, 1 Nov 2016 19:58:49 +0000 (12:58 -0700)]
Merge branch 'jk/no-looking-at-dotgit-outside-repo'

A small code cleanup.

* jk/no-looking-at-dotgit-outside-repo:
  sha1_name: make wraparound of the index into ring-buffer explicit

4 years agoMerge branch 'rs/cocci'
Junio C Hamano [Tue, 1 Nov 2016 19:58:49 +0000 (12:58 -0700)]
Merge branch 'rs/cocci'

Improve the rule to convert "unsigned char [20]" into "struct
object_id *" in contrib/coccinelle/

* rs/cocci:
  cocci: avoid self-references in object_id transformations

4 years agosplit-index: s/eith/with/ typo fix
Christian Couder [Sun, 23 Oct 2016 09:26:30 +0000 (11:26 +0200)]
split-index: s/eith/with/ typo fix

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agococci: avoid self-references in object_id transformations
René Scharfe [Tue, 1 Nov 2016 08:49:12 +0000 (09:49 +0100)]
cocci: avoid self-references in object_id transformations

The object_id functions oid_to_hex, oid_to_hex_r, oidclr, oidcmp, and
oidcpy are defined as wrappers of their legacy counterparts sha1_to_hex,
sha1_to_hex_r, hashclr, hashcmp, and hashcpy, respectively.  Make sure
that the Coccinelle transformations for converting legacy function calls
are not applied to these wrappers themselves, which would result in
tautological declarations.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agosha1_name: make wraparound of the index into ring-buffer explicit
René Scharfe [Tue, 1 Nov 2016 08:49:07 +0000 (09:49 +0100)]
sha1_name: make wraparound of the index into ring-buffer explicit

Overflow is defined for unsigned integers, but not for signed ones.
Wrap around explicitly for the new ring-buffer in find_unique_abbrev()
as we did in bb84735c for the ones in sha1_to_hex() and get_pathname(),
thus avoiding signed overflows and getting rid of the magic number 3.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agol10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
Jiang Xin [Tue, 1 Nov 2016 13:36:26 +0000 (21:36 +0800)]
l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)

Generate po/git.pot from v2.11.0-rc0 for git v2.11.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
4 years agoGit 2.11-rc0 v2.11.0-rc0
Junio C Hamano [Mon, 31 Oct 2016 20:19:53 +0000 (13:19 -0700)]
Git 2.11-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'nd/test-helpers'
Junio C Hamano [Mon, 31 Oct 2016 20:15:27 +0000 (13:15 -0700)]
Merge branch 'nd/test-helpers'

Update to the test framework made in 2.9 timeframe broke running
the tests under valgrind, which has been fixed.

* nd/test-helpers:
  valgrind: support test helpers

4 years agoMerge branch 'sc/fmt-merge-msg-doc-markup-fix'
Junio C Hamano [Mon, 31 Oct 2016 20:15:26 +0000 (13:15 -0700)]
Merge branch 'sc/fmt-merge-msg-doc-markup-fix'

Documentation fix.

* sc/fmt-merge-msg-doc-markup-fix:
  Documentation/fmt-merge-msg: fix markup in example

4 years agoMerge branch 'ak/sh-setup-dot-source-i18n-fix'
Junio C Hamano [Mon, 31 Oct 2016 20:15:25 +0000 (13:15 -0700)]
Merge branch 'ak/sh-setup-dot-source-i18n-fix'

Recent update to git-sh-setup (a library of shell functions that
are used by our in-tree scripted Porcelain commands) included
another shell library git-sh-i18n without specifying where it is,
relying on the $PATH.  This has been fixed to be more explicit by
prefixing $(git --exec-path) output in front.

* ak/sh-setup-dot-source-i18n-fix:
  git-sh-setup: be explicit where to dot-source git-sh-i18n from.

4 years agoMerge branch 'rs/commit-pptr-simplify'
Junio C Hamano [Mon, 31 Oct 2016 20:15:25 +0000 (13:15 -0700)]
Merge branch 'rs/commit-pptr-simplify'

Code simplification.

* rs/commit-pptr-simplify:
  commit: simplify building parents list

4 years agoMerge branch 'jk/rebase-config-insn-fmt-docfix'
Junio C Hamano [Mon, 31 Oct 2016 20:15:24 +0000 (13:15 -0700)]
Merge branch 'jk/rebase-config-insn-fmt-docfix'

Documentation fix.

* jk/rebase-config-insn-fmt-docfix:
  doc: fix missing "::" in config list

4 years agoMerge branch 'ak/pre-receive-hook-template-modefix'
Junio C Hamano [Mon, 31 Oct 2016 20:15:23 +0000 (13:15 -0700)]
Merge branch 'ak/pre-receive-hook-template-modefix'

A trivial clean-up to a recently graduated topic.

* ak/pre-receive-hook-template-modefix:
  pre-receive.sample: mark it executable

4 years agoMerge branch 'jk/common-main'
Junio C Hamano [Mon, 31 Oct 2016 20:15:23 +0000 (13:15 -0700)]
Merge branch 'jk/common-main'

A trivial clean-up to a recently graduated topic.

* jk/common-main:
  git-compat-util: move content inside ifdef/endif guards

4 years agoMerge branch 'aw/numbered-stash'
Junio C Hamano [Mon, 31 Oct 2016 20:15:22 +0000 (13:15 -0700)]
Merge branch 'aw/numbered-stash'

The user always has to say "stash@{$N}" when naming a single
element in the default location of the stash, i.e. reflogs in
refs/stash.  The "git stash" command learned to accept "git stash
apply 4" as a short-hand for "git stash apply stash@{4}".

* aw/numbered-stash:
  stash: allow stashes to be referenced by index only

4 years agoMerge branch 'jt/trailer-with-cruft'
Junio C Hamano [Mon, 31 Oct 2016 20:15:22 +0000 (13:15 -0700)]
Merge branch 'jt/trailer-with-cruft'

Update "interpret-trailers" machinery and teaches it that people in
real world write all sorts of crufts in the "trailer" that was
originally designed to have the neat-o "Mail-Header: like thing"
and nothing else.

* jt/trailer-with-cruft:
  trailer: support values folded to multiple lines
  trailer: forbid leading whitespace in trailers
  trailer: allow non-trailers in trailer block
  trailer: clarify failure modes in parse_trailer
  trailer: make args have their own struct
  trailer: streamline trailer item create and add
  trailer: use list.h for doubly-linked list
  trailer: improve const correctness

4 years agoMerge branch 'ls/filter-process'
Junio C Hamano [Mon, 31 Oct 2016 20:15:21 +0000 (13:15 -0700)]
Merge branch 'ls/filter-process'

The smudge/clean filter API expect an external process is spawned
to filter the contents for each path that has a filter defined.  A
new type of "process" filter API has been added to allow the first
request to run the filter for a path to spawn a single process, and
all filtering need is served by this single process for multiple
paths, reducing the process creation overhead.

* ls/filter-process:
  contrib/long-running-filter: add long running filter example
  convert: add filter.<driver>.process option
  convert: prepare filter.<driver>.process option
  convert: make apply_filter() adhere to standard Git error handling
  pkt-line: add functions to read/write flush terminated packet streams
  pkt-line: add packet_write_gently()
  pkt-line: add packet_flush_gently()
  pkt-line: add packet_write_fmt_gently()
  pkt-line: extract set_packet_header()
  pkt-line: rename packet_write() to packet_write_fmt()
  run-command: add clean_on_exit_handler
  run-command: move check_pipe() from write_or_die to run_command
  convert: modernize tests
  convert: quote filter names in error messages

4 years agoMerge branch 'ls/git-open-cloexec'
Junio C Hamano [Mon, 31 Oct 2016 20:15:21 +0000 (13:15 -0700)]
Merge branch 'ls/git-open-cloexec'

Git generally does not explicitly close file descriptors that were
open in the parent process when spawning a child process, but most
of the time the child does not want to access them. As Windows does
not allow removing or renaming a file that has a file descriptor
open, a slow-to-exit child can even break the parent process by
holding onto them.  Use O_CLOEXEC flag to open files in various
codepaths.

* ls/git-open-cloexec:
  read-cache: make sure file handles are not inherited by child processes
  sha1_file: open window into packfiles with O_CLOEXEC
  sha1_file: rename git_open_noatime() to git_open()

4 years agogit-sh-setup: be explicit where to dot-source git-sh-i18n from.
Anders Kaseorg [Sun, 30 Oct 2016 02:10:02 +0000 (22:10 -0400)]
git-sh-setup: be explicit where to dot-source git-sh-i18n from.

d323c6b641 ("i18n: git-sh-setup.sh: mark strings for translation",
2016-06-17) started to dot-source git-sh-i18n shell script library,
assuming that $PATH is already adjusted for our scripts, namely,
$GIT_EXEC_PATH is at the beginning of $PATH.

Old contrib scripts like contrib/convert-grafts-to-replace-refs.sh
and contrib/rerere-train.sh and third-party scripts like guilt may
however be using this as ". $(git --exec-path)/git-sh-setup",
without satisfying that assumption.  Be more explicit by specifying
its path prefixed with "$(git --exec-path)/". to be safe.

While we’re here, move the sourcing of git-sh-i18n below the shell
portability fixes.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agocommit: simplify building parents list
René Scharfe [Sat, 29 Oct 2016 12:55:36 +0000 (14:55 +0200)]
commit: simplify building parents list

Push pptr down into the FROM_MERGE branch of the if/else statement,
where it's actually used, and call commit_list_append() for appending
elements instead of playing tricks with commit_list_insert().  Call
copy_commit_list() in the amend branch instead of open-coding it.  Don't
bother setting pptr in the final branch as it's not used thereafter.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agodoc: fix missing "::" in config list
Jeff King [Sun, 30 Oct 2016 18:46:33 +0000 (14:46 -0400)]
doc: fix missing "::" in config list

The rebase.instructionFormat option is missing its "::" to
tell AsciiDoc that it's a list entry. As a result, the
option name gets lumped into the description in one big
paragraph.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agopre-receive.sample: mark it executable
Anders Kaseorg [Fri, 28 Oct 2016 18:40:41 +0000 (14:40 -0400)]
pre-receive.sample: mark it executable

For consistency with other hooks, make the sample hook executable.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoSync with 2.10.2
Junio C Hamano [Fri, 28 Oct 2016 16:03:50 +0000 (09:03 -0700)]
Sync with 2.10.2

4 years agoGit 2.10.2 v2.10.2
Junio C Hamano [Fri, 28 Oct 2016 16:02:44 +0000 (09:02 -0700)]
Git 2.10.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'pb/test-parse-options-expect' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:24 +0000 (09:01 -0700)]
Merge branch 'pb/test-parse-options-expect' into maint

Test clean-up.

* pb/test-parse-options-expect:
  t0040: convert all possible tests to use `test-parse-options --expect`

4 years agoMerge branch 'jc/cocci-xstrdup-or-null' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)]
Merge branch 'jc/cocci-xstrdup-or-null' into maint

Code cleanup.

* jc/cocci-xstrdup-or-null:
  cocci: refactor common patterns to use xstrdup_or_null()

4 years agoMerge branch 'rs/cocci' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)]
Merge branch 'rs/cocci' into maint

Code cleanup.

* rs/cocci:
  use strbuf_add_unique_abbrev() for adding short hashes, part 3
  remove unnecessary NULL check before free(3)
  coccicheck: make transformation for strbuf_addf(sb, "...") more precise
  use strbuf_add_unique_abbrev() for adding short hashes, part 2
  use strbuf_addstr() instead of strbuf_addf() with "%s", part 2
  gitignore: ignore output files of coccicheck make target
  use strbuf_addstr() for adding constant strings to a strbuf, part 2
  add coccicheck make target
  contrib/coccinelle: fix semantic patch for oid_to_hex_r()

4 years agoMerge branch 'jc/diff-unique-abbrev-comments' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)]
Merge branch 'jc/diff-unique-abbrev-comments' into maint

A bit more comments in a tricky code.

* jc/diff-unique-abbrev-comments:
  diff_unique_abbrev(): document its assumption and limitation

4 years agoMerge branch 'rs/pretty-format-color-doc-fix' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)]
Merge branch 'rs/pretty-format-color-doc-fix' into maint

Small doc update.

* rs/pretty-format-color-doc-fix:
  pretty: fix document link for color specification

4 years agoMerge branch 'js/reset-usage' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:22 +0000 (09:01 -0700)]
Merge branch 'js/reset-usage' into maint

Message fix-up.

* js/reset-usage:
  reset: fix usage

4 years agoMerge branch 'po/fix-doc-merge-base-illustration' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)]
Merge branch 'po/fix-doc-merge-base-illustration' into maint

Some AsciiDoc formatter mishandles a displayed illustration with
tabs in it.  Adjust a few of them in merge-base documentation to
work around them.

* po/fix-doc-merge-base-illustration:
  doc: fix the 'revert a faulty merge' ASCII art tab spacing
  doc: fix merge-base ASCII art tab spacing

4 years agoMerge branch 'jk/tap-verbose-fix' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:20 +0000 (09:01 -0700)]
Merge branch 'jk/tap-verbose-fix' into maint

The Travis CI configuration we ship ran the tests with --verbose
option but this risks non-TAP output that happens to be "ok" to be
misinterpreted as TAP signalling a test that passed.  This resulted
in unnecessary failure.  This has been corrected by introducing a
new mode to run our tests in the test harness to send the verbose
output separately to the log file.

* jk/tap-verbose-fix:
  test-lib: bail out when "-v" used under "prove"
  travis: use --verbose-log test option
  test-lib: add --verbose-log option
  test-lib: handle TEST_OUTPUT_DIRECTORY with spaces

4 years agoMerge branch 'tg/add-chmod+x-fix' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:19 +0000 (09:01 -0700)]
Merge branch 'tg/add-chmod+x-fix' into maint

A hot-fix for a test added by a recent topic that went to both
'master' and 'maint' already.

* tg/add-chmod+x-fix:
  t3700: fix broken test under !SANITY

4 years agoMerge branch 'bw/submodule-branch-dot-doc' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:19 +0000 (09:01 -0700)]
Merge branch 'bw/submodule-branch-dot-doc' into maint

Recent git allows submodule.<name>.branch to use a special token
"." instead of the branch name; the documentation has been updated
to describe it.

* bw/submodule-branch-dot-doc:
  submodules doc: update documentation for "." used for submodule branches

4 years agoMerge branch 'jk/tighten-alloc' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:18 +0000 (09:01 -0700)]
Merge branch 'jk/tighten-alloc' into maint

Protect our code from over-eager compilers.

* jk/tighten-alloc:
  inline xalloc_flex() into FLEXPTR_ALLOC_MEM
  avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM

4 years agoMerge branch 'jk/fetch-quick-tag-following' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:17 +0000 (09:01 -0700)]
Merge branch 'jk/fetch-quick-tag-following' into maint

When fetching from a remote that has many tags that are irrelevant
to branches we are following, we used to waste way too many cycles
when checking if the object pointed at by a tag (that we are not
going to fetch!) exists in our repository too carefully.

* jk/fetch-quick-tag-following:
  fetch: use "quick" has_sha1_file for tag following

4 years agoMerge branch 'jk/merge-base-fork-point-without-reflog' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:17 +0000 (09:01 -0700)]
Merge branch 'jk/merge-base-fork-point-without-reflog' into maint

"git rebase" immediately after "git clone" failed to find the fork
point from the upstream.

* jk/merge-base-fork-point-without-reflog:
  merge-base: handle --fork-point without reflog

4 years agoMerge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:16 +0000 (09:01 -0700)]
Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint

In a worktree connected to a repository elsewhere, created via "git
worktree", "git checkout" attempts to protect users from confusion
by refusing to check out a branch that is already checked out in
another worktree.  However, this also prevented checking out a
branch, which is designated as the primary branch of a bare
reopsitory, in a worktree that is connected to the bare
repository.  The check has been corrected to allow it.

* dk/worktree-dup-checkout-with-bare-is-ok:
  worktree: allow the main brach of a bare repository to be checked out

4 years agoMerge branch 'sb/submodule-config-doc-drop-path' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:16 +0000 (09:01 -0700)]
Merge branch 'sb/submodule-config-doc-drop-path' into maint

The "submodule.<name>.path" stored in .gitmodules is never copied
to .git/config and such a key in .git/config has no meaning, but
the documentation described it and submodule.<name>.url next to
each other as if both belong to .git/config.  This has been fixed.

* sb/submodule-config-doc-drop-path:
  documentation: improve submodule.<name>.{url, path} description

4 years agoMerge branch 'jk/ref-symlink-loop' into maint
Junio C Hamano [Fri, 28 Oct 2016 16:01:15 +0000 (09:01 -0700)]
Merge branch 'jk/ref-symlink-loop' into maint

A stray symbolic link in $GIT_DIR/refs/ directory could make name
resolution loop forever, which has been corrected.

* jk/ref-symlink-loop:
  files_read_raw_ref: prevent infinite retry loops in general
  files_read_raw_ref: avoid infinite loop on broken symlinks