gitweb.git
Merge branch 'va/mailinfo-doc-typofix'Junio C Hamano Tue, 17 May 2016 21:38:37 +0000 (14:38 -0700)

Merge branch 'va/mailinfo-doc-typofix'

Typofix.

* va/mailinfo-doc-typofix:
Documentation/git-mailinfo: fix typo

Merge branch 'jk/test-send-sh-x-trace-elsewhere'Junio C Hamano Tue, 17 May 2016 21:38:36 +0000 (14:38 -0700)

Merge branch 'jk/test-send-sh-x-trace-elsewhere'

Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.

* jk/test-send-sh-x-trace-elsewhere:
test-lib: set BASH_XTRACEFD automatically

Merge branch 'js/http-custom-headers'Junio C Hamano Tue, 17 May 2016 21:38:35 +0000 (14:38 -0700)

Merge branch 'js/http-custom-headers'

Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).

* js/http-custom-headers:
submodule: ensure that -c http.extraheader is heeded
t5551: make the test for extra HTTP headers more robust
tests: adjust the configuration for Apache 2.2

Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano Tue, 17 May 2016 21:38:35 +0000 (14:38 -0700)

Merge branch 'jk/rebase-interative-eval-fix'

Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).

* jk/rebase-interative-eval-fix:
rebase--interactive: avoid empty list in shell for-loop

Merge branch 'jc/fsck-nul-in-commit'Junio C Hamano Tue, 17 May 2016 21:38:34 +0000 (14:38 -0700)

Merge branch 'jc/fsck-nul-in-commit'

"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.

* jc/fsck-nul-in-commit:
fsck: detect and warn a commit with embedded NUL
fsck_commit_buffer(): do not special case the last validation

Merge branch 'nd/test-helpers'Junio C Hamano Tue, 17 May 2016 21:38:33 +0000 (14:38 -0700)

Merge branch 'nd/test-helpers'

Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.

* nd/test-helpers:
wrap-for-bin.sh: regenerate bin-wrappers when switching branches

Merge branch 'ls/travis-build-doc'Junio C Hamano Tue, 17 May 2016 21:38:33 +0000 (14:38 -0700)

Merge branch 'ls/travis-build-doc'

CI test was taught to build documentation pages.

* ls/travis-build-doc:
travis-ci: build documentation

Merge branch 'jc/ll-merge-internal'Junio C Hamano Tue, 17 May 2016 21:38:32 +0000 (14:38 -0700)

Merge branch 'jc/ll-merge-internal'

"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.

* jc/ll-merge-internal:
t6036: remove pointless test that expects failure
ll-merge: use a longer conflict marker for internal merge
ll-merge: fix typo in comment

Merge branch 'jc/linkgit-fix'Junio C Hamano Tue, 17 May 2016 21:38:31 +0000 (14:38 -0700)

Merge branch 'jc/linkgit-fix'

Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.

* jc/linkgit-fix:
Documentation: fix linkgit references

Merge branch 'va/i18n-remote-comment-to-align'Junio C Hamano Tue, 17 May 2016 21:38:30 +0000 (14:38 -0700)

Merge branch 'va/i18n-remote-comment-to-align'

Message fix.

* va/i18n-remote-comment-to-align:
i18n: remote: add comment for translators

Merge branch 'tb/t5601-sed-fix'Junio C Hamano Tue, 17 May 2016 21:38:29 +0000 (14:38 -0700)

Merge branch 'tb/t5601-sed-fix'

Test fix.

* tb/t5601-sed-fix:
t5601: Remove trailing space in sed expression

Merge branch 'nd/error-errno'Junio C Hamano Tue, 17 May 2016 21:38:28 +0000 (14:38 -0700)

Merge branch 'nd/error-errno'

The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.

* nd/error-errno: (41 commits)
wrapper.c: use warning_errno()
vcs-svn: use error_errno()
upload-pack.c: use error_errno()
unpack-trees.c: use error_errno()
transport-helper.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
server-info.c: use error_errno()
sequencer.c: use error_errno()
run-command.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
reachable.c: use error_errno()
mailmap.c: use error_errno()
ident.c: use warning_errno()
http.c: use error_errno() and warning_errno()
grep.c: use error_errno()
gpg-interface.c: use error_errno()
fast-import.c: use error_errno()
entry.c: use error_errno()
editor.c: use error_errno()
diff-no-index.c: use error_errno()
...

Merge branch 'jc/test-seq'Junio C Hamano Tue, 17 May 2016 21:38:28 +0000 (14:38 -0700)

Merge branch 'jc/test-seq'

Test fix.

* jc/test-seq:
test-lib-functions.sh: rewrite test_seq without Perl
test-lib-functions.sh: remove misleading comment on test_seq

Merge branch 'es/test-gpg-tags'Junio C Hamano Tue, 17 May 2016 21:38:27 +0000 (14:38 -0700)

Merge branch 'es/test-gpg-tags'

Test fix.

* es/test-gpg-tags:
t6302: simplify non-gpg cases

Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano Tue, 17 May 2016 21:38:26 +0000 (14:38 -0700)

Merge branch 'ak/t4151-ls-files-could-be-empty'

Test fix.

* ak/t4151-ls-files-could-be-empty:
t4151: make sure argument to 'test -z' is given

Merge branch 'jk/submodule-c-credential'Junio C Hamano Tue, 17 May 2016 21:38:25 +0000 (14:38 -0700)

Merge branch 'jk/submodule-c-credential'

An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".

* jk/submodule-c-credential:
submodule: stop sanitizing config options
submodule: use prepare_submodule_repo_env consistently
submodule--helper: move config-sanitizing to submodule.c
submodule: export sanitized GIT_CONFIG_PARAMETERS
t5550: break submodule config test into multiple sub-tests
t5550: fix typo in $HTTPD_URL

Merge branch 'nd/remote-plural-ours-plus-theirs'Junio C Hamano Tue, 17 May 2016 21:38:24 +0000 (14:38 -0700)

Merge branch 'nd/remote-plural-ours-plus-theirs'

Message fix.

* nd/remote-plural-ours-plus-theirs:
remote.c: specify correct plural form in "commit diverge" message

Merge branch 'bn/config-doc-tt-varnames'Junio C Hamano Tue, 17 May 2016 21:38:23 +0000 (14:38 -0700)

Merge branch 'bn/config-doc-tt-varnames'

Doc formatting fixes.

* bn/config-doc-tt-varnames:
config: consistently format $variables in monospaced font

Merge branch 'va/i18n-misc-updates'Junio C Hamano Tue, 17 May 2016 21:38:22 +0000 (14:38 -0700)

Merge branch 'va/i18n-misc-updates'

Mark several messages for translation.

* va/i18n-misc-updates:
i18n: unpack-trees: avoid substituting only a verb in sentences
i18n: builtin/pull.c: split strings marked for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: git-parse-remote.sh: mark strings for translation
i18n: branch: move comment for translators
i18n: branch: unmark string for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: unpack-trees: mark strings for translation
i18n: builtin/branch.c: mark option for translation
i18n: index-pack: use plural string instead of normal one

Merge branch 'js/t3404-typofix'Junio C Hamano Tue, 17 May 2016 21:38:22 +0000 (14:38 -0700)

Merge branch 'js/t3404-typofix'

* js/t3404-typofix:
t3404: fix typo

Merge branch 'sb/z-is-gnutar-ism'Junio C Hamano Tue, 17 May 2016 21:38:21 +0000 (14:38 -0700)

Merge branch 'sb/z-is-gnutar-ism'

* sb/z-is-gnutar-ism:
t6041: do not compress backup tar file
t3513: do not compress backup tar file

Merge branch 'lp/typofixes'Junio C Hamano Tue, 17 May 2016 21:38:20 +0000 (14:38 -0700)

Merge branch 'lp/typofixes'

* lp/typofixes:
typofix: assorted typofixes in comments, documentation and messages

Merge branch 'sb/submodule-deinit-all'Junio C Hamano Tue, 17 May 2016 21:38:19 +0000 (14:38 -0700)

Merge branch 'sb/submodule-deinit-all'

Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.

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

Merge branch 'jc/config-pathname-type'Junio C Hamano Tue, 17 May 2016 21:38:19 +0000 (14:38 -0700)

Merge branch 'jc/config-pathname-type'

Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.

* jc/config-pathname-type:
config: describe 'pathname' value type

Merge branch 'bn/http-cookiefile-config'Junio C Hamano Tue, 17 May 2016 21:38:18 +0000 (14:38 -0700)

Merge branch 'bn/http-cookiefile-config'

"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.

* bn/http-cookiefile-config:
http: expand http.cookieFile as a path
Documentation: config: improve word ordering for http.cookieFile

Merge branch 'ab/hooks'Junio C Hamano Tue, 17 May 2016 21:38:17 +0000 (14:38 -0700)

Merge branch 'ab/hooks'

A new configuration variable core.hooksPath allows customizing
where the hook directory is.

* ab/hooks:
hooks: allow customizing where the hook directory is
githooks.txt: minor improvements to the grammar & phrasing
githooks.txt: amend dangerous advice about 'update' hook ACL
githooks.txt: improve the intro section

Merge branch 'sb/submodule-init'Junio C Hamano Tue, 17 May 2016 21:38:16 +0000 (14:38 -0700)

Merge branch 'sb/submodule-init'

Update of "git submodule" to move pieces of logic to C continues.

* sb/submodule-init:
submodule init: redirect stdout to stderr
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule init: fail gracefully with a missing .gitmodules file
submodule: port init from shell to C
submodule: port resolve_relative_url from shell to C

Twelfth batch for 2.9Junio C Hamano Fri, 13 May 2016 20:23:24 +0000 (13:23 -0700)

Twelfth batch for 2.9

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

Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano Fri, 13 May 2016 20:18:28 +0000 (13:18 -0700)

Merge branch 'sb/submodule-module-list-pathspec-fix'

* sb/submodule-module-list-pathspec-fix:
submodule deinit test: fix broken && chain in subshell

Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano Fri, 13 May 2016 20:18:27 +0000 (13:18 -0700)

Merge branch 'jc/commit-tree-ignore-commit-gpgsign'

"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".

* jc/commit-tree-ignore-commit-gpgsign:
commit-tree: do not pay attention to commit.gpgsign

git-multimail: update to release 1.3.1Matthieu Moy Fri, 13 May 2016 17:00:41 +0000 (19:00 +0200)

git-multimail: update to release 1.3.1

The changes are described in CHANGES.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

i18n: unpack-trees: avoid substituting only a verb... Vasco Almeida Thu, 12 May 2016 23:16:26 +0000 (23:16 +0000)

i18n: unpack-trees: avoid substituting only a verb in sentences

Instead of reusing the same set of message templates for checkout
and other actions and substituting the verb with "%s", prepare
separate message templates for each known action. That would make
it easier for translation into languages where the same verb may
conjugate differently depending on the message we are giving.

See gettext documentation for details:
http://www.gnu.org/software/gettext/manual/html_node/Preparing-Strings.html

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

Documentation/git-mailinfo: fix typoVasco Almeida Wed, 11 May 2016 20:42:54 +0000 (20:42 +0000)

Documentation/git-mailinfo: fix typo

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

test-lib: set BASH_XTRACEFD automaticallyJeff King Wed, 11 May 2016 13:44:04 +0000 (09:44 -0400)

test-lib: set BASH_XTRACEFD automatically

Passing "-x" to a test script enables the shell's "set -x"
tracing, which can help with tracking down the command that
is causing a failure. Unfortunately, it can also _cause_
failures in some tests that redirect the stderr of a shell
function. Inside the function the shell continues to
respect "set -x", and the trace output is collected along
with whatever stderr is generated normally by the function.

You can see an example of this by running:

./t0040-parse-options.sh -x -i

which will fail immediately in the first test, as it
expects:

test_must_fail some-cmd 2>output.err

to leave output.err empty (but with "-x" it has our trace
output).

Unfortunately there isn't a portable or scalable solution to
this. We could teach test_must_fail to disable "set -x", but
that doesn't help any of the other functions or subshells.

However, we can work around it by pointing the "set -x"
output to our descriptor 4, which always points to the
original stderr of the test script. Unfortunately this only
works for bash, but it's better than nothing (and other
shells will just ignore the BASH_XTRACEFD variable).

The patch itself is a simple one-liner, but note the caveats
in the accompanying comments.

Automatic tests for our "-x" option may be a bit too meta
(and a pain, because they are bash-specific), but I did
confirm that it works correctly both with regular "-x" and
with "--verbose-only=1". This works because the latter flips
"set -x" off and on for particular tests (if it didn't, we
would get tracing for all tests, as going to descriptor 4
effectively circumvents the verbose flag).

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

rebase--interactive: avoid empty list in shell for... Jeff King Tue, 10 May 2016 21:07:10 +0000 (17:07 -0400)

rebase--interactive: avoid empty list in shell for-loop

The $strategy_opts variable contains a space-separated list
of strategy options, each individually shell-quoted. To loop
over each, we "unwrap" them by doing an eval like:

eval '
for opt in '"$strategy_opts"'
do
...
done
'

Note the quoting that means we expand $strategy_opts inline
in the code to be evaluated (which is the right thing
because we want the IFS-split and de-quoting). If the
variable is empty, however, we ask the shell to eval the
following code:

for opt in
do
...
done

without anything between "in" and "do". Most modern shells
are happy to treat that like a noop, but reportedly ksh88 on
AIX considers it a syntax error. So let's catch the case
that the variable is empty and skip the eval altogether
(since we know the loop would be a noop anyway).

Reported-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eleventh batch for 2.9Junio C Hamano Tue, 10 May 2016 20:46:57 +0000 (13:46 -0700)

Eleventh batch for 2.9

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

Merge branch 'svn/bad-ref' of git://bogomips.org/git-svnJunio C Hamano Tue, 10 May 2016 20:40:57 +0000 (13:40 -0700)

Merge branch 'svn/bad-ref' of git://bogomips.org/git-svn

* 'svn/bad-ref' of git://bogomips.org/git-svn:
Git/SVN: die when there is no commit metadata

Merge branch 'sk/gitweb-highlight-encoding'Junio C Hamano Tue, 10 May 2016 20:40:33 +0000 (13:40 -0700)

Merge branch 'sk/gitweb-highlight-encoding'

Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.

* sk/gitweb-highlight-encoding:
gitweb: apply fallback encoding before highlight

Merge branch 'sb/clean-test-fix'Junio C Hamano Tue, 10 May 2016 20:40:32 +0000 (13:40 -0700)

Merge branch 'sb/clean-test-fix'

* sb/clean-test-fix:
t7300: mark test with SANITY

Merge branch 'rn/glossary-typofix'Junio C Hamano Tue, 10 May 2016 20:40:31 +0000 (13:40 -0700)

Merge branch 'rn/glossary-typofix'

* rn/glossary-typofix:
Documentation: fix typo 'In such these cases'

Merge branch 'ls/travis-submitting-patches'Junio C Hamano Tue, 10 May 2016 20:40:30 +0000 (13:40 -0700)

Merge branch 'ls/travis-submitting-patches'

* ls/travis-submitting-patches:
Documentation: add setup instructions for Travis CI

Merge branch 'js/close-packs-before-gc'Junio C Hamano Tue, 10 May 2016 20:40:30 +0000 (13:40 -0700)

Merge branch 'js/close-packs-before-gc'

* js/close-packs-before-gc:
t5510: run auto-gc in the foreground

Merge branch 'ew/normal-to-e'Junio C Hamano Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)

Merge branch 'ew/normal-to-e'

* ew/normal-to-e:
.mailmap: update to my shorter email address

Merge branch 'ls/p4-lfs'Junio C Hamano Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)

Merge branch 'ls/p4-lfs'

Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
git-p4: fix Git LFS pointer parsing
travis-ci: express Linux/OS X dependency versions more clearly
travis-ci: update Git-LFS and P4 to the latest version

Merge branch 'sb/misc-cleanups'Junio C Hamano Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)

Merge branch 'sb/misc-cleanups'

* sb/misc-cleanups:
submodule-config: don't shadow `cache`
config.c: drop local variable

Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano Tue, 10 May 2016 20:40:28 +0000 (13:40 -0700)

Merge branch 'ew/doc-split-pack-disables-bitmap'

Doc update.

* ew/doc-split-pack-disables-bitmap:
pack-objects: warn on split packs disabling bitmaps

wrap-for-bin.sh: regenerate bin-wrappers when switching... Duy Nguyen Tue, 10 May 2016 11:58:56 +0000 (18:58 +0700)

wrap-for-bin.sh: regenerate bin-wrappers when switching branches

Commit e6e7530 (test helpers: move test-* to t/helper/ subdirectory -
2016-04-13) moves test-* to t/helper. However because bin-wrappers/*
only depend on wrap-for-bin.sh, when switching between a branch that has
this commit and one that does not, bin-wrappers/* may not be regenerated
and point to the old/outdated test programs.

This commit makes a non-functional change in wrap-for-bin.sh, just
enough for 'make' to detect and re-execute wrap-for-bin.sh. When
switching between a branch containing both this commit and e6e7530 and
one containing neither, bin-wrappers/*, we should get fresh bin-wrappers/*.

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

submodule: ensure that -c http.extraheader is heededJohannes Schindelin Tue, 10 May 2016 07:08:56 +0000 (09:08 +0200)

submodule: ensure that -c http.extraheader is heeded

To support this developer's use case of allowing build agents token-based
access to private repositories, we introduced the http.extraheader
feature, allowing extra HTTP headers to be sent along with every HTTP
request.

This patch verifies that we can configure these extra HTTP headers via the
command-line for use with `git submodule update`, too. Example: git -c
http.extraheader="Secret: Sauce" submodule update --init

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3404: fix typoJohannes Schindelin Tue, 10 May 2016 14:05:58 +0000 (16:05 +0200)

t3404: fix typo

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

travis-ci: build documentationLars Schneider Wed, 4 May 2016 08:38:36 +0000 (10:38 +0200)

travis-ci: build documentation

Build documentation as separate Travis CI job to check for
documentation errors.

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

Merge branch 'jk/submodule-c-credential' into js/http... Junio C Hamano Tue, 10 May 2016 17:38:31 +0000 (10:38 -0700)

Merge branch 'jk/submodule-c-credential' into js/http-custom-headers

* jk/submodule-c-credential:
submodule: stop sanitizing config options
submodule: use prepare_submodule_repo_env consistently
submodule--helper: move config-sanitizing to submodule.c
submodule: export sanitized GIT_CONFIG_PARAMETERS
t5550: break submodule config test into multiple sub-tests
t5550: fix typo in $HTTPD_URL
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
git: submodule honor -c credential.* from command line
quote: implement sq_quotef()
submodule: fix segmentation fault in submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: check argc count for git submodule--helper clone
submodule: don't pass empty string arguments to submodule--helper clone

t5551: make the test for extra HTTP headers more robustJohannes Schindelin Mon, 9 May 2016 06:19:00 +0000 (08:19 +0200)

t5551: make the test for extra HTTP headers more robust

To test that extra HTTP headers are passed correctly, t5551 verifies that
a fetch succeeds when two required headers are passed, and that the fetch
does not succeed when those headers are not passed.

However, this test would also succeed if the configuration required only
one header. As Apache's configuration is notoriously tricky (this
developer frequently requires StackOverflow's help to understand Apache's
documentation), especially when still supporting the 2.2 line, let's just
really make sure that the test verifies what we want it to verify.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: adjust the configuration for Apache 2.2Johannes Schindelin Mon, 9 May 2016 05:59:16 +0000 (07:59 +0200)

tests: adjust the configuration for Apache 2.2

Lars Schneider noticed that the configuration introduced to test the
extra HTTP headers cannot be used with Apache 2.2 (which is still
actively maintained, as pointed out by Junio Hamano).

To let the tests pass with Apache 2.2 again, let's substitute the
offending <RequireAll> and `expr` by using old school RewriteCond
statements.

As RewriteCond does not allow testing for *non*-matches, we simply match
the desired case first and let it pass by marking the RewriteRule as
'[L]' ("last rule, do not process any other matching RewriteRules after
this"), and then have another RewriteRule that matches all other cases
and lets them fail via '[F]' ("fail").

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Tested-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck: detect and warn a commit with embedded NULJunio C Hamano Thu, 14 Apr 2016 17:58:22 +0000 (10:58 -0700)

fsck: detect and warn a commit with embedded NUL

Even though a Git commit object is designed to be capable of storing
any binary data as its payload, in practice people use it to describe
the changes in textual form, and tools like "git log" are designed to
treat the payload as text.

Detect and warn when we see any commit object with a NUL byte in
it.

Note that a NUL byte in the header part is already detected as a
grave error. This change is purely about the message part.

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

Documentation: fix linkgit referencesJunio C Hamano Wed, 4 May 2016 17:36:24 +0000 (10:36 -0700)

Documentation: fix linkgit references

There are a handful of incorrect "linkgit:<page>[<section>]"
instances in our documentation set.

* Some have an extra colon after "linkgit:"; fix them by removing
the extra colon;

* Some refer to a page outside the Git suite, namely curl(1); fix
them by using the `curl(1)` that already appears on the same page
for the same purpose of referring the readers to its manual page.

* Some spell the name of the page incorrectly, e.g. "rev-list" when
they mean "git-rev-list"; fix them.

* Some list the manual section incorrectly; fix them to make sure
they match what is at the top of the target of the link.

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

t6036: remove pointless test that expects failureJunio C Hamano Wed, 27 Apr 2016 22:05:57 +0000 (15:05 -0700)

t6036: remove pointless test that expects failure

One test in t6036 prepares a file whose contents contain these
lines:

<<<<<<< Temporary merge branch 1
C
=======
B
>>>>>>> Temporary merge branch 2

and uses recursive merge strategy to run criss-cross merge with it.

Manual merge resolution by users fundamentally depends on being able
to distinguish the tracked contents from the separator lines added
by "git merge" in order to allow users to tell which block of lines
came from where. You can deliberately craft a file with lines that
resemble conflict marker lines to make it impossible for the user
(the outer merge of merge-recursive counts as a user of the result
of "virtual parent" merge) to tell which part is which, and write a
test to demonstrate that with such a file that "git merge" cannot
fundamentally work well and has to fail.

It however is pointless and waste of time and resource to run such a
test that asserts the obvious.

In real life, people who do need to track files with such lines that
have <<<< ==== >>>> as their prefixes set the conflict-marker-size
attribute to make sure they will be able to tell between the tracked
lines that happen to begin with these (confusing) prefixes and the
marker lines that are added by "git merge".

Remove the test as pointless waste of resource.

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

ll-merge: use a longer conflict marker for internal... Junio C Hamano Thu, 14 Apr 2016 22:35:09 +0000 (15:35 -0700)

ll-merge: use a longer conflict marker for internal merge

The primary use of conflict markers is to help the user who resolves
the final (outer) merge by hand to show which part came from which
branch by separating the blocks of lines apart. When the conflicted
parts from a "virtual ancestor" merge created by merge-recursive
remains in the common ancestor part in the final result, however,
the conflict markers that are the same size as the final merge
become harder to see.

Increase the conflict marker size slightly for these inner merges so
that the markers from the final merge and cruft from internal merge
can be distinguished more easily.

This would help reduce the common issue that prevents "rerere" from
being used on a really complex conflict.

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

test-lib-functions.sh: rewrite test_seq without PerlJunio C Hamano Mon, 9 May 2016 19:37:01 +0000 (12:37 -0700)

test-lib-functions.sh: rewrite test_seq without Perl

Rewrite the 'seq' imitation using only commands and features that
are typically found built into modern POSIX shells, instead of
relying on Perl to run a single-liner script.

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

t4151: make sure argument to 'test -z' is givenArmin Kunaschik Mon, 9 May 2016 18:57:25 +0000 (11:57 -0700)

t4151: make sure argument to 'test -z' is given

88d50724 (am --skip: revert changes introduced by failed 3way merge,
2015-06-06), unlike all the other patches in the series, forgot to
quote the output from "$(git ls-files -u)" when using it as the
argument to "test -z", leading to a syntax error on platforms whose
test does not interpret "test -z" (no other arguments) as testing if
a string "-z" is the null string (which GNU test and test that is
built into bash and dash seem to do).

Note that $(git ls-files -u | wc -l) is deliberately left unquoted,
as some implementations of "wc -l" includes extra blank characters
in its output and cannot be compared as string, i.e. "test 0 = $(...)".

Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib-functions.sh: remove misleading comment on... Junio C Hamano Mon, 9 May 2016 18:36:09 +0000 (11:36 -0700)

test-lib-functions.sh: remove misleading comment on test_seq

We never used the "letters" form since we came up with "test_seq" to
replace use of non-portable "seq" in our test script, which we
introduced it at d17cf5f3 (tests: Introduce test_seq, 2012-08-04).

We use this helper to either iterate for N times (i.e. the values on
the lines do not even matter), or just to get N distinct strings
(i.e. the values on the lines themselves do not really matter, but
we care that they are different from each other and reproducible).

Stop promising that we may allow using "letters"; this would open an
easier reimplementation that does not rely on $PERL, if somebody
later wants to.

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

wrapper.c: use warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:48:01 +0000 (16:48 +0700)

wrapper.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>

vcs-svn: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:48:00 +0000 (16:48 +0700)

vcs-svn: 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>

upload-pack.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:59 +0000 (16:47 +0700)

upload-pack.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>

unpack-trees.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:58 +0000 (16:47 +0700)

unpack-trees.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>

transport-helper.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:57 +0000 (16:47 +0700)

transport-helper.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>

sha1_file.c: use {error,die,warning}_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:56 +0000 (16:47 +0700)

sha1_file.c: use {error,die,warning}_errno()

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

server-info.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:55 +0000 (16:47 +0700)

server-info.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>

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

sequencer.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>

run-command.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:53 +0000 (16:47 +0700)

run-command.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>

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

rerere.c: use 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>

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

reachable.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>

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

mailmap.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>

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

ident.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>

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

http.c: use 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>

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

grep.c: use error_errno()

While at there, improve the error message a bit (what operation failed?)

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

gpg-interface.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:46 +0000 (16:47 +0700)

gpg-interface.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>

fast-import.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:45 +0000 (16:47 +0700)

fast-import.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>

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

entry.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>

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

editor.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>

diff-no-index.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:42 +0000 (16:47 +0700)

diff-no-index.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>

credential-cache--daemon.c: use warning_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:41 +0000 (16:47 +0700)

credential-cache--daemon.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>

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

copy.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>

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

connected.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>

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

config.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>

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

compat/win32/syslog.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>

combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:36 +0000 (16:47 +0700)

combine-diff.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>

check-racy.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:35 +0000 (16:47 +0700)

check-racy.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/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy Sun, 8 May 2016 09:47:34 +0000 (16:47 +0700)

builtin/worktree.c: use error_errno()

While at there, improve the error message to say _what_ failed to
remove.

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

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>