gitweb.git
builtin/upload-archive.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:33 +0000 (16:47 +0700)

builtin/upload-archive.c: use error_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/update-index.c: prefer "err" to "errno" in... Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:32 +0000 (16:47 +0700)

builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

"errno" is already passed in as "err". Here we should use err instead of
errno. errno is probably a copy/paste mistake in e011054 (Teach
git-update-index about gitlinks - 2007-04-12)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/rm.c: use warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:31 +0000 (16:47 +0700)

builtin/rm.c: use warning_errno()

While at there, improve the message a bit (what operation failed?) and
mark it for translation since the format string is now a sentence.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/pack-objects.c: use die_errno() and warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:30 +0000 (16:47 +0700)

builtin/pack-objects.c: use die_errno() and warning_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/merge-file.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:29 +0000 (16:47 +0700)

builtin/merge-file.c: use error_errno()

All these error() calls do not print error message previously, but
because when they are called, errno should be set. Use error_errno()
instead to give more information.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/mailsplit.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:28 +0000 (16:47 +0700)

builtin/mailsplit.c: use error_errno()

There's one change, in split_mbox(), where an error() without strerror()
as argument is converted to error_errno(). This is correct because the
previous call is fopen (not shown in the context lines), which should
set errno if it returns NULL.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/help.c: use warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:27 +0000 (16:47 +0700)

builtin/help.c: use warning_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/fetch.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:26 +0000 (16:47 +0700)

builtin/fetch.c: use error_errno()

A couple of newlines are also removed, because both error() and
error_errno() automatically append a newline.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/branch.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:25 +0000 (16:47 +0700)

builtin/branch.c: use error_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:24 +0000 (16:47 +0700)

builtin/am.c: use error_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bisect.c: use die_errno() and warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:23 +0000 (16:47 +0700)

bisect.c: use die_errno() and warning_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

usage.c: add warning_errno() and error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:22 +0000 (16:47 +0700)

usage.c: add warning_errno() and error_errno()

Similar to die_errno(), these functions will append strerror()
automatically.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

usage.c: move format processing out of die_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:21 +0000 (16:47 +0700)

usage.c: move format processing out of die_errno()

fmt_with_err() will be shared with the coming error_errno() and
warning_errno().

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

i18n: remote: add comment for translatorsVasco Almeida Sun, 8 May 2016 20:00:18 +0000 (20:00 +0000)

i18n: remote: add comment for translators

Add comment drawing translator attention in order to align "Push
URL:" and "Fetch URL:" fields translation of git remote show output.

Aligning both fields makes the output more appealing and easier to
grasp.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t6302: simplify non-gpg casesJeff King Mon, 9 May 2016 16:49:00 +0000 (12:49 -0400)

t6302: simplify non-gpg cases

When commit 618310a taught t6302 to run without the GPG
prerequisite, it did so by conditionally creating the signed
tags only when gpg is available. As a result, further tests
need to take this into account, which they can do with the
test_prepare_expect helper. This is a minor hassle, though,
as the helper cannot easily cover all cases (it just matches
"signed" in the output, so all output must include the
actual refname).

Instead, let's take a different approach. We'll always
create the tags, and only conditionally sign them. This does
mean our tag-names are a minor lie, but it lets the tests
which do not care about signing easily behave the same in
all settings. We'll include a comment to document our lie
and avoid confusing further test-writers.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t6041: do not compress backup tar fileStefan Beller Mon, 9 May 2016 17:09:08 +0000 (10:09 -0700)

t6041: do not compress backup tar file

The test uses the 'z' option, i.e. "compress the output while at
it", which is GNUism and not portable.

Reported-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3513: do not compress backup tar fileStefan Beller Fri, 6 May 2016 18:37:05 +0000 (11:37 -0700)

t3513: do not compress backup tar file

The test uses the 'z' option, i.e. "compress the output while at
it", which is GNUism and not portable.

Reported-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5601: Remove trailing space in sed expressionTorsten Bögershausen Mon, 9 May 2016 17:53:12 +0000 (19:53 +0200)

t5601: Remove trailing space in sed expression

The sed expression for IPv6, "Tested User And Host" or "tuah" used a wrong
sed expression, which doesn't work under all versions of sed.

Reported-By: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git/SVN: die when there is no commit metadataChristian Couder Sat, 7 May 2016 06:58:43 +0000 (08:58 +0200)

Git/SVN: die when there is no commit metadata

When passing a bad --trunk option to `git svn clone`, like for example the
same URL that we are cloning:

C:\Windows\system32>git svn clone
https://mycompany.svn.beanstalkapp.com/myproject --no-metadata -A
c:\temp\svn_to_git_users.txt
--trunk=https://mycompany.svn.beanstalkapp.com/myproject
--tags=https://mycompany.svn.beanstalkapp.com/myproject/tags
--branches=https://mycompany.svn.beanstalkapp.com/myproject/branches
c:\code\Git_myproject

One gets an "Use of uninitialized value $u in substitution (s///)" error:

[...]
W: +empty_dir: branches/20080918_DBDEPLOY/vendor/src/csharp/MS WCSF
Contrib/src/Services
W: +empty_dir: branches/20080918_DBDEPLOY/vendor/src/csharp/RealWorldControls/References
r530 = c276e3b039d8e38759c6fb17443349732552d7a2 (refs/remotes/origin/trunk)
Found possible branch point:
https://mycompany.svn.beanstalkapp.com/myproject/trunk =>
https://mycompany.svn.beanstalkapp.com/myproject/branches/20080918_DBDEPLOY,
529
Use of uninitialized value $u in substitution (s///) at
/mingw32/share/perl5/site_perl/Git/SVN.pm line 101.
Use of uninitialized value $u in concatenation (.) or string at
/mingw32/share/perl5/site_perl/Git/SVN.pm line 101.
refs/remotes/origin/trunk:
'https://mycompany.svn.beanstalkapp.com/myproject' not found in ''
C:\Windows\system32>

Let's fix that by just die()ing when we have an uninitialized value because we
cannot get commit metadata from a ref.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Eric Wong <e@80x24.org>

Sync with maintJunio C Hamano Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)

Sync with maint

* maint:
Almost ready for 2.8.3

Almost ready for 2.8.3Junio C Hamano Fri, 6 May 2016 21:53:36 +0000 (14:53 -0700)

Almost ready for 2.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)

Merge branch 'sb/submodule-path-misc-bugs' into maint

"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

Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)

Merge branch 'ky/imap-send-openssl-1.1.0' into maint

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

Merge branch 'js/replace-edit-use-editor-configuration... Junio C Hamano Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)

Merge branch 'js/replace-edit-use-editor-configuration' into maint

"git replace -e" did not honour "core.editor" configuration.

* js/replace-edit-use-editor-configuration:
replace --edit: respect core.editor

Merge branch 'cc/apply' into maintJunio C Hamano Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)

Merge branch 'cc/apply' into maint

Minor code clean-up.

* cc/apply:
builtin/apply: free patch when parse_chunk() fails
builtin/apply: handle parse_binary() failure
apply: remove unused call to free() in gitdiff_{old,new}name()
builtin/apply: get rid of useless 'name' variable

Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)

Merge branch 'kn/for-each-tag-branch' into maint

A minor documentation update.

* kn/for-each-tag-branch:
for-each-ref: fix description of '--contains' in manpage

Tenth batch for 2.9Junio C Hamano Fri, 6 May 2016 21:48:26 +0000 (14:48 -0700)

Tenth batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/diff-compact-heuristic'Junio C Hamano Fri, 6 May 2016 21:45:46 +0000 (14:45 -0700)

Merge branch 'jk/diff-compact-heuristic'

Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.

* jk/diff-compact-heuristic:
diff: undocument the compaction heuristic knobs for experimentation
xdiff: implement empty line chunk heuristic
xdiff: add recs_match helper function

Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano Fri, 6 May 2016 21:45:45 +0000 (14:45 -0700)

Merge branch 'ls/p4-lfs-test-fix-2.7.0'

Fix a broken test.

* ls/p4-lfs-test-fix-2.7.0:
t9824: fix wrong reference value
t9824: fix broken &&-chain in a subshell

Merge branch 'bc/object-id'Junio C Hamano Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)

Merge branch 'bc/object-id'

Move from unsigned char[20] to struct object_id continues.

* bc/object-id:
match-trees: convert several leaf functions to use struct object_id
tree-walk: convert tree_entry_extract() to use struct object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
match-trees: convert shift_tree() and shift_tree_by() to use object_id
test-match-trees: convert to use struct object_id
sha1-name: introduce a get_oid() function

Merge branch 'bw/rebase-merge-entire-branch'Junio C Hamano Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)

Merge branch 'bw/rebase-merge-entire-branch'

"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.

* bw/rebase-merge-entire-branch:
git-rebase--merge: don't include absent parent as a base

Merge branch 'jc/drop-git-spec-in'Junio C Hamano Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)

Merge branch 'jc/drop-git-spec-in'

As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".

* jc/drop-git-spec-in:
Makefile: remove dependency on git.spec
Makefile: stop pretending to support rpmbuild

Merge branch 'js/http-custom-headers'Junio C Hamano Fri, 6 May 2016 21:45:43 +0000 (14:45 -0700)

Merge branch 'js/http-custom-headers'

HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.

* js/http-custom-headers:
http: support sending custom HTTP headers

Merge branch 'sb/clone-shallow-passthru'Junio C Hamano Fri, 6 May 2016 21:45:43 +0000 (14:45 -0700)

Merge branch 'sb/clone-shallow-passthru'

"git clone" learned "--shallow-submodules" option.

* sb/clone-shallow-passthru:
clone: add `--shallow-submodules` flag

Merge branch 'ld/p4-test-py3'Junio C Hamano Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)

Merge branch 'ld/p4-test-py3'

The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.

* ld/p4-test-py3:
git-p4 tests: time_in_seconds should use $PYTHON_PATH
git-p4 tests: work with python3 as well as python2
git-p4 tests: cd to / before running python

Merge branch 'sb/config-exit-status-list'Junio C Hamano Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)

Merge branch 'sb/config-exit-status-list'

Doc update.

* sb/config-exit-status-list:
config doc: improve exit code listing

typofix: assorted typofixes in comments, documentation... Li Peng Fri, 6 May 2016 12:36:46 +0000 (20:36 +0800)

typofix: assorted typofixes in comments, documentation and messages

Many instances of duplicate words (e.g. "the the path") and
a few typoes are fixed, originally in multiple patches.

wildmatch: fix duplicate words of "the"
t: fix duplicate words of "output"
transport-helper: fix duplicate words of "read"
Git.pm: fix duplicate words of "return"
path: fix duplicate words of "look"
pack-protocol.txt: fix duplicate words of "the"
precompose-utf8: fix typo of "sequences"
split-index: fix typo
worktree.c: fix typo
remote-ext: fix typo
utf8: fix duplicate words of "the"
git-cvsserver: fix duplicate words

Signed-off-by: Li Peng <lip@dtdream.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: stop sanitizing config optionsJeff King Thu, 5 May 2016 01:22:19 +0000 (21:22 -0400)

submodule: stop sanitizing config options

The point of having a whitelist of command-line config
options to pass to submodules was two-fold:

1. It prevented obvious nonsense like using core.worktree
for multiple repos.

2. It could prevent surprise when the user did not mean
for the options to leak to the submodules (e.g.,
http.sslverify=false).

For case 1, the answer is mostly "if it hurts, don't do
that". For case 2, we can note that any such example has a
matching inverted surprise (e.g., a user who meant
http.sslverify=true to apply everywhere, but it didn't).

So this whitelist is probably not giving us any benefit, and
is already creating a hassle as people propose things to put
on it. Let's just drop it entirely.

Note that we still need to keep a special code path for
"prepare the submodule environment", because we still have
to take care to pass through $GIT_CONFIG_PARAMETERS (and
block the rest of the repo-specific environment variables).

We can do this easily from within the submodule shell
script, which lets us drop the submodule--helper option
entirely (and it's OK to do so because as a "--" program, it
is entirely a private implementation detail).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote.c: specify correct plural form in "commit diverg... Nguyễn Thái Ngọc Duy Tue, 3 May 2016 00:12:30 +0000 (07:12 +0700)

remote.c: specify correct plural form in "commit diverge" message

We need to count both "ours" and "theirs" commits when selecting plural
form for this message. Note that even though in this block, both ours
and theirs must be positive (i.e. can't be in singular form), we still
keep Q_(singular, plural) because languages other than English may have
more than one plural form.

Reported-by: Alfonsogonzalez, Ernesto (GE Digital) <ernesto.alfonsogonzalez@ge.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

config: consistently format $variables in monospaced... Brian Norris Wed, 4 May 2016 19:24:48 +0000 (12:24 -0700)

config: consistently format $variables in monospaced font

We don't consistently use `backticks` for formatting shell variables.
This patch improves the consistency on shell variables (and a few nearby
mentions of "gpg" commands), though it still doesn't straighten out the
use of "quotes."

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule deinit: require '--all' instead of '.' for... Stefan Beller Thu, 5 May 2016 19:52:32 +0000 (12:52 -0700)

submodule deinit: require '--all' instead of '.' for all submodules

The discussion in [1] pointed out that '.' is a faulty suggestion as
there is a corner case where it fails:

> "submodule deinit ." may have "worked" in the sense that you would
> have at least one path in your tree and avoided this "nothing
> matches" most of the time. It would have still failed with the
> exactly same error if run in an empty repository, i.e.
>
> $ E=/var/tmp/x/empty && rm -fr "$E" && mkdir -p "$E" && cd "$E"
> $ git init
> $ rungit v2.6.6 submodule deinit .
> error: pathspec '.' did not match any file(s) known to git.
> Did you forget to 'git add'?
> $ >file && git add file
> $ rungit v2.6.6 submodule deinit .
> $ echo $?
> 0

So instead of a pathspec add the '--all' option to deinit all submodules
and add a test to check for the corner case of an empty repository.

The code only needs to learn about the '--all' option and doesn't
require further changes as `git submodule--helper list "$@"` will list
all submodules when "$@" is empty.

[1] http://news.gmane.org/gmane.comp.version-control.git/289535

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7507-commit-verbose: improve test coverage by testing... Pranit Bauva Thu, 5 May 2016 09:50:01 +0000 (15:20 +0530)

t7507-commit-verbose: improve test coverage by testing number of diffs

Make the fake "editor" store output of grep in a file so that we can
see how many diffs were contained in the message and use them in
individual tests where ever it is required. A subsequent commit will
introduce scenarios where it is important to be able to exactly
determine how many diffs were present.

The fake "editor" is always made to succeed regardless of whether grep
found diff headers or not so that we don't have to use 'test_must_fail'
for which 'test_line_count = 0' is an easy substitute and also helps in
maintaining the consistency.

Also use write_script() to create the fake "editor".

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

parse-options.c: make OPTION_COUNTUP respect "unspecifi... Pranit Bauva Thu, 5 May 2016 09:50:00 +0000 (15:20 +0530)

parse-options.c: make OPTION_COUNTUP respect "unspecified" values

OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.

Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.

This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).

Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.

To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.

Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t7507: improve test coveragePranit Bauva Thu, 5 May 2016 09:49:59 +0000 (15:19 +0530)

t/t7507: improve test coverage

git-commit and git-status share the same implementation thus it is
necessary to ensure that changes specific to git-commit don't
accidentally impact git-status.

This test verifies that changes made to verbose in git-commit does not
impact git-status.

Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t0040-parse-options: improve test coveragePranit Bauva Thu, 5 May 2016 09:49:58 +0000 (15:19 +0530)

t0040-parse-options: improve test coverage

Include tests to check for multiple levels of quiet and to check the
behavior of '--no-quiet'.

Include tests to check for multiple levels of verbose and to check the
behavior of '--no-verbose'.

Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hooks: allow customizing where the hook directory isÆvar Arnfjörð Bjarmason Wed, 4 May 2016 22:58:12 +0000 (22:58 +0000)

hooks: allow customizing where the hook directory is

Change the hardcoded lookup for .git/hooks/* to optionally lookup in
$(git config core.hooksPath)/* instead.

This is essentially a more intrusive version of the git-init ability to
specify hooks on init time via init templates.

The difference between that facility and this feature is that this can
be set up after the fact via e.g. ~/.gitconfig or /etc/gitconfig to
apply for all your personal repositories, or all repositories on the
system.

I plan on using this on a centralized Git server where users can create
arbitrary repositories under /gitroot, but I'd like to manage all the
hooks that should be run centrally via a unified dispatch mechanism.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

githooks.txt: minor improvements to the grammar & phrasingÆvar Arnfjörð Bjarmason Wed, 4 May 2016 22:58:11 +0000 (22:58 +0000)

githooks.txt: minor improvements to the grammar & phrasing

Change:

* Sentences that needed "the" or "a" to either add those or change them
so they don't need them.

* The little tangent about "You can use this to do X (if your project
wants to do X)" can just be shortened to "if you want to do X".

* s/parameter/parameters/ when the plural made more sense.

Most of this goes all the way back to the initial introduction of
hooks.txt in 6d35cc76 (Document hooks., 2005-09-02).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

githooks.txt: amend dangerous advice about 'update... Ævar Arnfjörð Bjarmason Wed, 4 May 2016 22:58:10 +0000 (22:58 +0000)

githooks.txt: amend dangerous advice about 'update' hook ACL

Any ACL you implement via an 'update' hook isn't actual access control
if the user has login access to the machine running git, because they
can trivially just build their own version of Git which doesn't run the
hook.

Change the documentation to take this dangerous edge case into account,
and remove the mention of the advice originating on the mailing list,
the users reading this don't care where the idea came up.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

githooks.txt: improve the intro sectionÆvar Arnfjörð Bjarmason Wed, 4 May 2016 22:58:09 +0000 (22:58 +0000)

githooks.txt: improve the intro section

Change the documentation so that:

* We don't talk about "little scripts". Hooks can be as big as you
want, and don't have to be scripts, just call them "programs".

* We note that we change the working directory before a hook is called,
nothing documented this explicitly, but the current behavior is
predictable. It helps a lot to know what directory these hooks will
be executed from.

* We don't make claims about the example hooks which may not be true
depending on the configuration of 'init.templateDir'. Clarify that
we're talking about the default settings of git-init in those cases,
and move some of this documentation into git-init's documentation
about the default templates.

* We briefly note in the intro that hooks can get their arguments in
various different ways, and that how exactly is described below for
each hook.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http: expand http.cookieFile as a pathBrian Norris Wed, 4 May 2016 18:42:15 +0000 (11:42 -0700)

http: expand http.cookieFile as a path

This should handle .gitconfig files that specify things like:

[http]
cookieFile = "~/.gitcookies"

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: config: improve word ordering for http... Brian Norris Wed, 4 May 2016 18:42:14 +0000 (11:42 -0700)

Documentation: config: improve word ordering for http.cookieFile

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

config: describe 'pathname' value typeJunio C Hamano Fri, 29 Apr 2016 17:43:55 +0000 (10:43 -0700)

config: describe 'pathname' value type

We have a dedicated section for various value-types used in the
configuration variables already, because we needed to describe how
booleans and scaled integers can be spelled, and the pathname type
would fit there.

Adjust the description of `include.path`, `core.excludesFile` and
`commit.template` variables slightly to clarify that these variables
are of this type.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with maintJunio C Hamano Tue, 3 May 2016 21:52:30 +0000 (14:52 -0700)

Sync with maint

* maint:
git-multimail: update to release 1.3.0

Ninth batch for 2.9Junio C Hamano Tue, 3 May 2016 21:15:10 +0000 (14:15 -0700)

Ninth batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'nf/mergetool-prompt'Junio C Hamano Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)

Merge branch 'nf/mergetool-prompt'

UI consistency improvements.

* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent

Merge branch 'jd/send-email-to-whom'Junio C Hamano Tue, 3 May 2016 21:08:16 +0000 (14:08 -0700)

Merge branch 'jd/send-email-to-whom'

A question by "git send-email" to ask the identity of the sender
has been updated.

* jd/send-email-to-whom:
send-email: fix grammo in the prompt that asks e-mail recipients

Merge branch 'rt/string-list-lookup-cleanup'Junio C Hamano Tue, 3 May 2016 21:08:15 +0000 (14:08 -0700)

Merge branch 'rt/string-list-lookup-cleanup'

Code cleanup.

* rt/string-list-lookup-cleanup:
string_list: use string-list API in unsorted_string_list_lookup()

Merge branch 'jk/fix-attribute-macro-in-2.5'Junio C Hamano Tue, 3 May 2016 21:08:15 +0000 (14:08 -0700)

Merge branch 'jk/fix-attribute-macro-in-2.5'

Code fixup.

* jk/fix-attribute-macro-in-2.5:
remote.c: spell __attribute__ correctly

Merge branch 'sg/test-lib-simplify-expr-away'Junio C Hamano Tue, 3 May 2016 21:08:14 +0000 (14:08 -0700)

Merge branch 'sg/test-lib-simplify-expr-away'

Code cleanup.

* sg/test-lib-simplify-expr-away:
test-lib: simplify '--option=value' parsing

Merge branch 'nd/remove-unused'Junio C Hamano Tue, 3 May 2016 21:08:13 +0000 (14:08 -0700)

Merge branch 'nd/remove-unused'

Code cleanup.

* nd/remove-unused:
wrapper.c: delete dead function git_mkstemps()
dir.c: remove dead function fnmatch_icase()

Merge branch 'js/name-rev-use-oldest-ref'Junio C Hamano Tue, 3 May 2016 21:08:13 +0000 (14:08 -0700)

Merge branch 'js/name-rev-use-oldest-ref'

"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."

* js/name-rev-use-oldest-ref:
name-rev: include taggerdate in considering the best name

Merge branch 'jd/p4-jobs-in-commit'Junio C Hamano Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)

Merge branch 'jd/p4-jobs-in-commit'

"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.

* jd/p4-jobs-in-commit:
git-p4: add P4 jobs to git commit message
git-p4: clean-up code style in tests

Merge branch 'en/merge-fixes'Junio C Hamano Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)

Merge branch 'en/merge-fixes'

"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.

* en/merge-fixes:
merge-recursive: do not check working copy when creating a virtual merge base
merge-recursive: remove duplicate code

git-multimail: update to release 1.3.0Matthieu Moy Tue, 3 May 2016 08:31:42 +0000 (10:31 +0200)

git-multimail: update to release 1.3.0

The changes are described in CHANGES.

Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Contributions-by: Stefan Tatschner <rumpelsepp@sevenbyte.org>
Contributions-by: Simon P <simon.git@le-huit.fr>
Contributions-by: Leander Hasty <leander@1stplayable.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7300: mark test with SANITYStefan Beller Tue, 3 May 2016 18:54:32 +0000 (11:54 -0700)

t7300: mark test with SANITY

The test runs `chmod 0` on a file to test a case where Git fails to
read it, but that would not work if it is run as root.

Reported-by: Jan Keromnes <janx@linux.com>
Fix-proposed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: apply fallback encoding before highlightShin Kojima Tue, 3 May 2016 13:00:51 +0000 (22:00 +0900)

gitweb: apply fallback encoding before highlight

Some multi-byte character encodings (such as Shift_JIS and GBK) have
characters whose final bytes is an ASCII '\' (0x5c), and they
will be displayed as funny-characters even if $fallback_encoding is
correct. This is because `highlight` command always expects UTF-8
encoded strings from STDIN.

$ echo 'my $v = "申";' | highlight --syntax perl | w3m -T text/html -dump
my $v = "申";

$ echo 'my $v = "申";' | iconv -f UTF-8 -t Shift_JIS | highlight \
--syntax perl | iconv -f Shift_JIS -t UTF-8 | w3m -T text/html -dump

iconv: (stdin):9:135: cannot convert
my $v = "

This patch prepare git blob objects to be encoded into UTF-8 before
highlighting in the manner of `to_utf8` subroutine.

Signed-off-by: Shin Kojima <shin@kojima.org>
Reviewed-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit-tree: do not pay attention to commit.gpgsignJunio C Hamano Mon, 2 May 2016 21:58:45 +0000 (14:58 -0700)

commit-tree: do not pay attention to commit.gpgsign

ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a
"signed commit" by teaching the --[no]-gpg-sign option and the
commit.gpgsign configuration variable to various commands that
create commits.

Teaching these to "git commit" and "git merge", both of which are
end-user facing Porcelain commands, was perfectly fine. Allowing
the plumbing "git commit-tree" to suddenly change the behaviour to
surprise the scripts by paying attention to commit.gpgsign was not.

Among the in-tree scripts, filter-branch, quiltimport, rebase and
stash are the commands that run "commit-tree". If any of these
wants to allow users to always sign every single commit, they should
offer their own configuration (e.g. "filterBranch.gpgsign") with an
option to disable signing (e.g. "git filter-branch --no-gpgsign").

Ignoring commit.gpgsign option _obviously_ breaks the backward
compatibility, but it is easy to follow the standard pattern in
scripts to honor whatever configuration variable they choose to
follow. E.g.

case $(git config --bool commit.gpgsign) in
true) sign=-S ;;
*) sign= ;;
esac &&
git commit-tree $sign ...whatever other args...

Do so to make sure that "git rebase" keeps paying attention to the
configuration variable, which unfortunately is a documented mistake.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule init: redirect stdout to stderrStefan Beller Mon, 2 May 2016 22:24:04 +0000 (15:24 -0700)

submodule init: redirect stdout to stderr

Reroute the output of stdout to stderr as it is just informative
messages, not to be consumed by machines.

This should not regress any scripts that try to parse the
current output, as the output is already internationalized
and therefore unstable.

We want to init submodules from the helper for `submodule update`
in a later patch and the stdout output of said helper is consumed
by the parts of `submodule update` which are still written in shell.
So we have to be careful which messages are on stdout.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule deinit test: fix broken && chain in subshellStefan Beller Mon, 2 May 2016 22:24:02 +0000 (15:24 -0700)

submodule deinit test: fix broken && chain in subshell

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with maintJunio C Hamano Mon, 2 May 2016 22:50:34 +0000 (15:50 -0700)

Sync with maint

* maint:
Start preparing for 2.8.3

Start preparing for 2.8.3Junio C Hamano Mon, 2 May 2016 21:23:48 +0000 (14:23 -0700)

Start preparing for 2.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/use-write-script-more' into maintJunio C Hamano Mon, 2 May 2016 21:24:14 +0000 (14:24 -0700)

Merge branch 'jk/use-write-script-more' into maint

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

Merge branch 'jc/xstrfmt-null-with-prec-0' into maintJunio C Hamano Mon, 2 May 2016 21:24:14 +0000 (14:24 -0700)

Merge branch 'jc/xstrfmt-null-with-prec-0' into maint

Code cleanup.

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

Merge branch 'ew/send-email-drop-data-dumper' into... Junio C Hamano Mon, 2 May 2016 21:24:13 +0000 (14:24 -0700)

Merge branch 'ew/send-email-drop-data-dumper' into maint

Code clean-up.

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

Merge branch 'ad/cygwin-wants-rename' into maintJunio C Hamano Mon, 2 May 2016 21:24:11 +0000 (14:24 -0700)

Merge branch 'ad/cygwin-wants-rename' into maint

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

Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano Mon, 2 May 2016 21:24:10 +0000 (14:24 -0700)

Merge branch 'jk/do-not-printf-NULL' into maint

"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

Merge branch 'jc/http-socks5h' into maintJunio C Hamano Mon, 2 May 2016 21:24:10 +0000 (14:24 -0700)

Merge branch 'jc/http-socks5h' into maint

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://

Merge branch 'ky/imap-send' into maintJunio C Hamano Mon, 2 May 2016 21:24:09 +0000 (14:24 -0700)

Merge branch 'ky/imap-send' into maint

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

Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano Mon, 2 May 2016 21:24:09 +0000 (14:24 -0700)

Merge branch 'ad/commit-have-m-option' into maint

"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

Merge branch 'sb/submodule-helper-clone-regression... Junio C Hamano Mon, 2 May 2016 21:24:08 +0000 (14:24 -0700)

Merge branch 'sb/submodule-helper-clone-regression-fix' into maint

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

Merge branch 'jk/branch-shortening-funny-symrefs' into... Junio C Hamano Mon, 2 May 2016 21:24:07 +0000 (14:24 -0700)

Merge branch 'jk/branch-shortening-funny-symrefs' into maint

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

Merge branch 'es/format-patch-doc-hide-no-patch' into... Junio C Hamano Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)

Merge branch 'es/format-patch-doc-hide-no-patch' into maint

"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.

* es/format-patch-doc-hide-no-patch:
git-format-patch.txt: don't show -s as shorthand for multiple options

Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano Mon, 2 May 2016 21:24:05 +0000 (14:24 -0700)

Merge branch 'ky/branch-m-worktree' into maint

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

Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano Mon, 2 May 2016 21:24:05 +0000 (14:24 -0700)

Merge branch 'ky/branch-d-worktree' into maint

When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree

* ky/branch-d-worktree:
branch -d: refuse deleting a branch which is currently checked out

Merge branch 'jk/check-repository-format' into maintJunio C Hamano Mon, 2 May 2016 21:24:04 +0000 (14:24 -0700)

Merge branch 'jk/check-repository-format' into maint

The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.

* jk/check-repository-format:
verify_repository_format: mark messages for translation
setup: drop repository_format_version global
setup: unify repository version callbacks
init: use setup.c's repo version verification
setup: refactor repo format reading and verification
config: drop git_config_early
check_repository_format_gently: stop using git_config_early
lazily load core.sharedrepository
wrap shared_repository global in get/set accessors
setup: document check_repository_format()

Merge branch 'ew/send-email-readable-message-id' into... Junio C Hamano Mon, 2 May 2016 21:24:04 +0000 (14:24 -0700)

Merge branch 'ew/send-email-readable-message-id' into maint

"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

.mailmap: update to my shorter email addressEric Wong Mon, 2 May 2016 19:31:21 +0000 (19:31 +0000)

.mailmap: update to my shorter email address

Following f916ab0ccc ("send-email: more meaningful Message-ID"),
my own email address is too long :x

While I could have an even shorter address by one character with
"yhbt.net", "80x24.org" is more representative of my
hacking-related pursuits.

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: fix typo 'In such these cases'René Nyffenegger Mon, 2 May 2016 07:38:20 +0000 (09:38 +0200)

Documentation: fix typo 'In such these cases'

Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: add setup instructions for Travis CILars Schneider Mon, 2 May 2016 08:12:12 +0000 (10:12 +0200)

Documentation: add setup instructions for Travis CI

Also change UK english "behaviour" to US english "behavior".

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5510: run auto-gc in the foregroundSZEDER Gábor Sun, 1 May 2016 15:37:43 +0000 (17:37 +0200)

t5510: run auto-gc in the foreground

The last test added to 't5510-fetch' in 0898c9628104 (fetch: release
pack files before garbage-collecting, 2016-01-13) may sporadically
trigger following error message from the test harness:

rm: cannot remove 'trash directory.t5510-fetch/auto-gc/.git': Directory not empty

The test in question forces an auto-gc, which, if the system supports
it, runs in the background by default, and occasionally takes long
enough for the test to finish and for 'test_done' to start
housekeeping. This can lead to the test's 'git gc --auto' in the
background and 'test_done's 'rm -rf $trash' in the foreground racing
each other to create and delete files and directories. It might just
happen that 'git gc' re-creates a directory that 'rm -rf' already
visited and removed, which ultimately triggers the above error.

Disable detaching the auto-gc process to ensure that it finishes
before the test can continue, thus avoiding this racy situation.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Windows: add pthread_sigmask() that does nothingJohannes Sixt Sun, 1 May 2016 19:08:21 +0000 (21:08 +0200)

Windows: add pthread_sigmask() that does nothing

A previous change introduced a call to pthread_sigmask() in order to block
SIGPIPE in a thread. Since there are no signal facilities on Windows that
are similar to POSIX signals, just ignore the request to block the signal.
In the particular case, the effect of blocking SIGPIPE on POSIX is that
write() calls return EPIPE when the reader closes the pipe. This is how
write() behaves on Windows.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff: undocument the compaction heuristic knobs for... Junio C Hamano Mon, 2 May 2016 17:36:36 +0000 (10:36 -0700)

diff: undocument the compaction heuristic knobs for experimentation

It seems that people around here are all happy with the updated
heuristics used to decide where the hunks are separated. Let's keep
that as the default. Even though we do not expect too much trouble
from the difference between the old and the new algorithms, just in
case let's leave the implementation of the knobs to turn it off for
emergencies. There is no longer need for documenting them, though.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eighth batch for 2.9Junio C Hamano Fri, 29 Apr 2016 20:03:27 +0000 (13:03 -0700)

Eighth batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 2.8.2Junio C Hamano Fri, 29 Apr 2016 21:20:47 +0000 (14:20 -0700)

Sync with 2.8.2

Git 2.8.2 v2.8.2Junio C Hamano Fri, 29 Apr 2016 21:18:16 +0000 (14:18 -0700)

Git 2.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano Fri, 29 Apr 2016 21:16:01 +0000 (14:16 -0700)

Merge branch 'js/mingw-tests-2.8' into maint

Code clean-up.

* js/mingw-tests-2.8:
Windows: shorten code by re-using convert_slashes()

Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano Fri, 29 Apr 2016 21:16:00 +0000 (14:16 -0700)

Merge branch 'ep/trace-doc-sample-fix' into maint

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

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

Merge branch 'jc/makefile-redirection-stderr' into... Junio C Hamano Fri, 29 Apr 2016 21:15:59 +0000 (14:15 -0700)

Merge branch 'jc/makefile-redirection-stderr' into maint

A minor fix in the Makefile.

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

Merge branch 'ak/use-hashmap-iter-first-in-submodule... Junio C Hamano Fri, 29 Apr 2016 21:15:58 +0000 (14:15 -0700)

Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint

Minor code cleanup.

* ak/use-hashmap-iter-first-in-submodule-config:
submodule-config: use hashmap_iter_first()

Merge branch 'tb/blame-force-read-cache-to-workaround... Junio C Hamano Fri, 29 Apr 2016 21:15:58 +0000 (14:15 -0700)

Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint

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