gitweb.git
Merge branch 'sg/diff-multiple-identical-renames' into... Junio C Hamano Fri, 29 Apr 2016 21:15:55 +0000 (14:15 -0700)

Merge branch 'sg/diff-multiple-identical-renames' into maint

"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.

* sg/diff-multiple-identical-renames:
diffcore: fix iteration order of identical files during rename detection

Merge branch 'ss/msvc' into maintJunio C Hamano Fri, 29 Apr 2016 21:15:54 +0000 (14:15 -0700)

Merge branch 'ss/msvc' into maint

Build updates for MSVC.

* ss/msvc:
MSVC: use shipped headers instead of fallback definitions
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

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

Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint

l10n-2.8.0-rnd3-fr

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

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

Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint

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

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

Prepare for 2.8.2

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

Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)

Merge branch 'jv/merge-nothing-into-void' into maint

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

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

Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano Fri, 15 Apr 2016 01:57:48 +0000 (18:57 -0700)

Merge branch 'ss/commit-squash-msg' into maint

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

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

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

Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint

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

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

Merge branch 'da/mergetool-delete-delete-conflict'... Junio C Hamano Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)

Merge branch 'da/mergetool-delete-delete-conflict' into maint

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

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

Merge branch 'jk/startup-info' into maintJunio C Hamano Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)

Merge branch 'jk/startup-info' into maint

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

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

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

Merge branch 'jk/getwholeline-getdelim-empty' into maint

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

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

Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep... Junio C Hamano Fri, 15 Apr 2016 01:57:45 +0000 (18:57 -0700)

Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint

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

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

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

Merge branch 'gf/fetch-pack-direct-object-fetch' into maint

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

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

Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano Fri, 15 Apr 2016 01:57:44 +0000 (18:57 -0700)

Merge branch 'jk/rev-parse-local-env-vars' into maint

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

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

Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano Fri, 15 Apr 2016 01:57:43 +0000 (18:57 -0700)

Merge branch 'jk/config-get-urlmatch' into maint

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

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

Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:18 +0000 (18:37 -0700)

Merge branch 'pb/t7502-drop-dup' into maint

Code clean-up.

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

Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:17 +0000 (18:37 -0700)

Merge branch 'jk/test-httpd-config-nosystem' into maint

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

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

Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:16 +0000 (18:37 -0700)

Merge branch 'sb/clone-t57-t56' into maint

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

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

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

Merge branch 'jk/credential-cache-comment-exit' into maint

A code clarification.

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

Merge branch 'jc/index-pack' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)

Merge branch 'jc/index-pack' into maint

Code clean-up.

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

Merge branch 'ss/exc-flag-is-a-collection-of-bits'... Junio C Hamano Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)

Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint

Code clean-up.

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

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

Merge branch 'mp/upload-pack-use-embedded-args' into maint

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

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

Merge branch 'oa/doc-diff-check' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)

Merge branch 'oa/doc-diff-check' into maint

A minor documentation update.

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

Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)

Merge branch 'pb/opt-cmdmode-doc' into maint

Minor API documentation update.

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

Merge branch 'nd/apply-doc' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)

Merge branch 'nd/apply-doc' into maint

A minor documentation update.

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

Merge branch 'cc/doc-recommend-performance-trace-to... Junio C Hamano Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)

Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint

A minor documentation update.

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

Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)

Merge branch 'mm/lockfile-error-message' into maint

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

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

Start preparing for 2.8.2

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

Git 2.8.1 v2.8.1Junio C Hamano Sun, 3 Apr 2016 17:11:35 +0000 (10:11 -0700)

Git 2.8.1

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

Merge branch 'mm/readme-markdown' into maintJunio C Hamano Sun, 3 Apr 2016 17:13:09 +0000 (10:13 -0700)

Merge branch 'mm/readme-markdown' into maint

* 'mm/readme-markdown':
git.spec.in: use README.md, not README

git.spec.in: use README.md, not READMEMatthieu Moy Fri, 1 Apr 2016 07:10:51 +0000 (09:10 +0200)

git.spec.in: use README.md, not README

The file was renamed in 4ad21f5 (README: use markdown syntax,
2016-02-25), but that commit forgot to update git.spec.in, which
caused the rpmbuild target in the Makefile to fail.

Reported-by: Ron Isaacson <isaacson.ljits@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diffcore: fix iteration order of identical files during... SZEDER Gábor Wed, 30 Mar 2016 08:35:07 +0000 (10:35 +0200)

diffcore: fix iteration order of identical files during rename detection

If the two paths 'dir/A/file' and 'dir/B/file' have identical content
and the parent directory is renamed, e.g. 'git mv dir other-dir', then
diffcore reports the following exact renames:

renamed: dir/B/file -> other-dir/A/file
renamed: dir/A/file -> other-dir/B/file

While technically not wrong, this is confusing not only for the user,
but also for git commands that make decisions based on rename
information, e.g. 'git log --follow other-dir/A/file' follows
'dir/B/file' past the rename.

This behavior is a side effect of commit v2.0.0-rc4~8^2~14
(diffcore-rename.c: simplify finding exact renames, 2013-11-14): the
hashmap storing sources returns entries from the same bucket, i.e.
sources matching the current destination, in LIFO order. Thus the
iteration first examines 'other-dir/A/file' and 'dir/B/file' and, upon
finding identical content and basename, reports an exact rename.

Other hashmap users are apparently happy with the current iteration
order over the entries of a bucket. Changing the iteration order
would risk upsetting other hashmap users and would increase the memory
footprint of each bucket by a pointer to the tail element.

Fill the hashmap with source entries in reverse order to restore the
original exact rename detection behavior.

Reported-by: Bill Okara <billokara@gmail.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

MSVC: use shipped headers instead of fallback definitionsSven Strickroth Wed, 30 Mar 2016 11:37:36 +0000 (13:37 +0200)

MSVC: use shipped headers instead of fallback definitions

VS2010 comes with stdint.h [1]
VS2013 comes with inttypes.h [2]

[1] https://stackoverflow.com/a/2628014/3906760
[2] https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/

Signed-off-by: Sven Strickroth <sven@cs-ware.de>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

MSVC: vsnprintf in Visual Studio 2015 doesn't need... Sven Strickroth Tue, 29 Mar 2016 16:25:28 +0000 (18:25 +0200)

MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

In MSVC2015 the behavior of vsnprintf was changed.
W/o this fix there is one character missing at the end.

Signed-off-by: Sven Strickroth <sven@cs-ware.de>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: git diff --check detects conflict markersOri Avtalion Tue, 29 Mar 2016 18:59:45 +0000 (21:59 +0300)

Documentation: git diff --check detects conflict markers

Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 2.8 v2.8.0Junio C Hamano Mon, 28 Mar 2016 19:19:45 +0000 (12:19 -0700)

Git 2.8

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

api-parse-options.txt: document OPT_CMDMODE()Pranit Bauva Fri, 25 Mar 2016 18:58:58 +0000 (18:58 +0000)

api-parse-options.txt: document OPT_CMDMODE()

OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively
notice when multiple "operation mode" options that specify mutually
incompatible operation modes are given.

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

Merge pull request #9 from vascool/frJean-Noël Avila Fri, 25 Mar 2016 16:11:20 +0000 (17:11 +0100)

Merge pull request #9 from vascool/fr

Fix inconsistencies

l10n: fr: don't translate "merge" as a parameterVasco Almeida Tue, 15 Mar 2016 00:34:22 +0000 (23:34 -0100)

l10n: fr: don't translate "merge" as a parameter

At builtin/checkout.c:1154, merge is a parameter to --conflict=<style>
(git checkout --conflict=merge).

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>

l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida Tue, 15 Mar 2016 00:34:22 +0000 (23:34 -0100)

l10n: fr: change "id de clé" to match "id-clé"

At builtin/tag.c:23 French message translation, "<key-id>" was
translated to "<id-clé>", but at builtin/tag.c:355 "key-id" was
translated to "id de clé", hence an inconsistency in git tag -h output.

Translate "key-id" to "id-clé".
Alternatively, both places could use "id de clé" instead of "id-clé".

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>

l10n: fr: fix wrongly translated option nameVasco Almeida Sun, 13 Mar 2016 12:56:03 +0000 (11:56 -0100)

l10n: fr: fix wrongly translated option name

In the original source, tags and heads refer to that options (--head and
--tags) for git show-ref.

Don't translate that terms, since they refer to actual option names.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>

l10n: fr: fix transcation of "dir"Vasco Almeida Sun, 13 Mar 2016 12:56:03 +0000 (11:56 -0100)

l10n: fr: fix transcation of "dir"

"dir" was translated to the same string at builtin/log.c:1236,
but, also at that code line, "<dir>" was translate to "<répertoire>".

Before this commit, git format-patch -h would output "-o,
--output-directory <dir>" and <répertoire> in its description.

Use <répertoire> in both the parameter and description.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>

Merge branch 'ls/p4-doc-markup'Junio C Hamano Thu, 24 Mar 2016 19:28:06 +0000 (12:28 -0700)

Merge branch 'ls/p4-doc-markup'

* ls/p4-doc-markup:
Documentation: fix git-p4 AsciiDoc formatting
Documentation: use ASCII quotation marks in git-p4

Merge branch 'js/mingw-tests-2.8'Junio C Hamano Thu, 24 Mar 2016 19:27:58 +0000 (12:27 -0700)

Merge branch 'js/mingw-tests-2.8'

* js/mingw-tests-2.8:
mingw: skip some tests in t9115 due to file name issues
t1300: fix the new --show-origin tests on Windows
t1300-repo-config: make it resilient to being run via 'sh -x'
config --show-origin: report paths with forward slashes

Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano Thu, 24 Mar 2016 19:27:12 +0000 (12:27 -0700)

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

A fix for a small regression in "module_list" helper that was
rewritten in C (also applies to 2.7.x).

* sb/submodule-module-list-pathspec-fix:
submodule: fix regression for deinit without submodules

git-apply.txt: mention the behavior inside a subdirNguyễn Thái Ngọc Duy Thu, 24 Mar 2016 11:56:17 +0000 (18:56 +0700)

git-apply.txt: mention the behavior inside a subdir

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

git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy Thu, 24 Mar 2016 11:56:16 +0000 (18:56 +0700)

git-apply.txt: remove a space

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

Merge branch 'master' of git://github.com/git-l10n... Junio C Hamano Wed, 23 Mar 2016 19:22:42 +0000 (12:22 -0700)

Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: pt_PT: Update and add new translations
l10n: ca.po: update translation
l10n: vi.po (2530t): Update translation

merge: fix NULL pointer dereference when merging nothin... Junio C Hamano Mon, 21 Mar 2016 19:01:43 +0000 (12:01 -0700)

merge: fix NULL pointer dereference when merging nothing into void

When we are on an unborn branch and merging only one foreign parent,
we allow "git merge" to fast-forward to that foreign parent commit.

This codepath incorrectly attempted to dereference the list of
parents that the merge is going to record even when the list is
empty. It must refuse to operate instead when there is no parent.

All other codepaths make sure the list is not empty before they
dereference it, and are safe.

Reported-by: Jose Ivan B. Vilarouca Filho
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: fix git-p4 AsciiDoc formattingLars Schneider Wed, 23 Mar 2016 10:59:01 +0000 (11:59 +0100)

Documentation: fix git-p4 AsciiDoc formatting

Noticed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin Wed, 23 Mar 2016 10:55:20 +0000 (11:55 +0100)

mingw: skip some tests in t9115 due to file name issues

These two tests wanted to write file names which are incompatible with
Windows' file naming rules (even if they pass using Cygwin due to
Cygwin's magic path mangling).

While at it, skip the same tests also on MacOSX/HFS, as pointed out by
Torsten Bögershausen.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1300: fix the new --show-origin tests on WindowsJohannes Schindelin Wed, 23 Mar 2016 10:55:13 +0000 (11:55 +0100)

t1300: fix the new --show-origin tests on Windows

On Windows, we have that funny situation where the test script can refer
to POSIX paths because it runs in a shell that uses a POSIX emulation
layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths
at all but only pure Windows paths.

So let's just convert the POSIX paths to Windows paths before passing
them on to Git, using `pwd` (which is already modified on Windows to
output Windows paths).

While fixing the new tests on Windows, we also have to exclude the tests
that want to write a file with a name that is illegal on Windows
(unfortunately, there is more than one test trying to make use of that
file).

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

t1300-repo-config: make it resilient to being run via... Johannes Schindelin Wed, 23 Mar 2016 10:55:07 +0000 (11:55 +0100)

t1300-repo-config: make it resilient to being run via 'sh -x'

One way to diagnose broken regression tests is to run the test
script using 'sh -x t... -i -v' to find out which call actually
demonstrates the symptom.

Hence it is pretty counterproductive if the test script behaves
differently when being run via 'sh -x', in particular when using
test_cmp or test_i18ncmp on redirected stderr. A more recent way
"sh tXXXX -i -v -x" has the same issue.

So let's use test_i18ngrep (as suggested by Jonathan Nieder) instead of
test_cmp/test_i18ncmp to verify that stderr looks as expected.

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

config --show-origin: report paths with forward slashesJohannes Schindelin Wed, 23 Mar 2016 10:55:00 +0000 (11:55 +0100)

config --show-origin: report paths with forward slashes

On Windows, the backslash is the native directory separator, but all
supported Windows versions also accept the forward slash in most
circumstances.

Our tests expect forward slashes.

Relative paths are generated by Git using forward slashes.

So let's try to be consistent and use forward slashes in the $HOME part
of the paths reported by `git config --show-origin`, too.

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

Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin Wed, 23 Mar 2016 15:01:51 +0000 (23:01 +0800)

Merge branch 'master' of https://github.com/vnwildman/git

* 'master' of https://github.com/vnwildman/git:
l10n: vi.po (2530t): Update translation

Merge branch 'master' of git://github.com/alexhenrie... Jiang Xin Wed, 23 Mar 2016 14:48:14 +0000 (22:48 +0800)

Merge branch 'master' of git://github.com/alexhenrie/git-po

* 'master' of git://github.com/alexhenrie/git-po:
l10n: ca.po: update translation

submodule: fix regression for deinit without submodulesStefan Beller Tue, 22 Mar 2016 23:42:14 +0000 (16:42 -0700)

submodule: fix regression for deinit without submodules

Per Cederqvist wrote:
> It used to be possible to run
>
> git submodule deinit -f .
>
> to remove any submodules, no matter how many submodules you had. That
> is no longer possible in projects that don't have any submodules at
> all. The command will fail with:
>
> error: pathspec '.' did not match any file(s) known to git.

This regression was introduced in 74703a1e4dfc (submodule: rewrite
`module_list` shell function in C, 2015-09-02), as we changed the
order of checking in new module listing to first check whether it is
a gitlin before feeding it to match_pathspec(). It used to be that
a pathspec that does not match any path were diagnosed as an error,
but the new code complains for a pathspec that does not match any
submodule path.

Arguably the new behaviour may give us a better diagnosis, but that
is inconsistent with the suggestion "deinit" gives, and also this
was an unintended accident. The new behaviour hopefully can be
redesigned and implemented better in future releases, but for now,
switch these two checks to restore the same behavior as before. In
an empty repository, giving the pathspec '.' will still get the same
"did not match" error, but that is the same bug we had before 1.7.0.

Reported-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: pt_PT: Update and add new translationsVasco Almeida Fri, 29 Jan 2016 20:06:29 +0000 (19:06 -0100)

l10n: pt_PT: Update and add new translations

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>

l10n: ca.po: update translationAlex Henrie Tue, 22 Mar 2016 05:04:22 +0000 (23:04 -0600)

l10n: ca.po: update translation

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

commit: do not lose SQUASH_MSG contentsSven Strickroth Mon, 21 Mar 2016 22:29:40 +0000 (23:29 +0100)

commit: do not lose SQUASH_MSG contents

When concluding a conflicted "git merge --squash", the command
failed to read SQUASH_MSG that was prepared by "git merge", and
showed only the "# Conflicts:" list of conflicted paths.

Place the contents from SQUASH_MSG at the beginning, just like we
show the commit log skeleton first when concluding a normal merge,
and then show the "# Conflicts:" list, to help the user write the
log message for the resulting commit.

Test by Junio C Hamano <gitster@pobox.com>.

Signed-off-by: Sven Strickroth <sven@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 2.8-rc4 v2.8.0-rc4Junio C Hamano Mon, 21 Mar 2016 20:41:37 +0000 (13:41 -0700)

Git 2.8-rc4

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

Sync with maintJunio C Hamano Mon, 21 Mar 2016 20:32:42 +0000 (13:32 -0700)

Sync with maint

* maint:
Documentation: fix broken linkgit to git-config
git-compat-util: st_add4: work around gcc 4.2.x compiler crash

Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano Mon, 21 Mar 2016 20:32:18 +0000 (13:32 -0700)

Merge branch 'mm/doc-hooks-linkgit-fix' into maint

* mm/doc-hooks-linkgit-fix:
Documentation: fix broken linkgit to git-config

Documentation: fix broken linkgit to git-configMatthieu Moy Mon, 21 Mar 2016 18:38:34 +0000 (19:38 +0100)

Documentation: fix broken linkgit to git-config

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

Documentation: use ASCII quotation marks in git-p4Lars Schneider Sun, 20 Mar 2016 18:39:21 +0000 (19:39 +0100)

Documentation: use ASCII quotation marks in git-p4

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

Merge branch 'tb/avoid-gcc-on-darwin-10-6'Junio C Hamano Mon, 21 Mar 2016 16:20:13 +0000 (09:20 -0700)

Merge branch 'tb/avoid-gcc-on-darwin-10-6'

* tb/avoid-gcc-on-darwin-10-6:
Revert "config.mak.uname: use clang for Mac OS X 10.6"

Revert "config.mak.uname: use clang for Mac OS X 10.6"Eric Sunshine Mon, 21 Mar 2016 04:35:58 +0000 (00:35 -0400)

Revert "config.mak.uname: use clang for Mac OS X 10.6"

This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb.

Now that st_add4() has been patched to work around the gcc 4.2.x
compiler crash, revert the sledge-hammer approach of forcing Mac OS X
10.6 to unconditionally use 'clang' rather than the default compiler
(gcc).

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'es/st-add4-gcc-4.2-workaround' into maintJunio C Hamano Mon, 21 Mar 2016 16:19:27 +0000 (09:19 -0700)

Merge branch 'es/st-add4-gcc-4.2-workaround' into maint

* es/st-add4-gcc-4.2-workaround:
git-compat-util: st_add4: work around gcc 4.2.x compiler crash

git-compat-util: st_add4: work around gcc 4.2.x compile... Eric Sunshine Mon, 21 Mar 2016 04:35:57 +0000 (00:35 -0400)

git-compat-util: st_add4: work around gcc 4.2.x compiler crash

Although changes by 5b442c4 (tree-diff: catch integer overflow in
combine_diff_path allocation, 2016-02-19) are perfectly valid, they
unfortunately trigger an internal compiler error in gcc 4.2.x:

combine-diff.c: In function 'diff_tree_combined':
combine-diff.c:1391: internal compiler error: Segmentation fault: 11

Experimentation reveals that changing st_add4()'s argument evaluation
order is sufficient to sidestep this problem.

Although st_add3() does not trigger the compiler bug, for style
consistency, change its argument evaluation order to match.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git... Junio C Hamano Mon, 21 Mar 2016 01:06:05 +0000 (18:06 -0700)

Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po

l10n-2.8.0-rnd3

* tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po:
l10n: zh_CN: review for git v2.8.0 l10n round 2
l10n: de.po: add missing newlines
l10n: de.po: translate 22 new messages
l10n: ko.po: Update Korean translation
l10n: fr.po v2.8.0 round 3
l10n: sv.po: Update Swedish translation (2530t0f0u)
l10n: ru.po: update Russian translation

Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano Mon, 21 Mar 2016 01:05:10 +0000 (18:05 -0700)

Merge branch 'master' of git://ozlabs.org/~paulus/gitk

* 'master' of git://ozlabs.org/~paulus/gitk:
gitk: Follow themed bgcolor in help dialogs
gitk: fr.po: Sync translations with git
gitk: Update French translation (311t)
gitk: Update German translation
gitk: Update Bulgarian translation (311t)

l10n: vi.po (2530t): Update translationTran Ngoc Quan Mon, 21 Mar 2016 00:21:04 +0000 (07:21 +0700)

l10n: vi.po (2530t): Update translation

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>

l10n: zh_CN: review for git v2.8.0 l10n round 2Ray Chen Wed, 16 Mar 2016 03:44:44 +0000 (11:44 +0800)

l10n: zh_CN: review for git v2.8.0 l10n round 2

Signed-off-by: Ray Chen <oldsharp@gmail.com>

gitk: Follow themed bgcolor in help dialogsGuillermo S. Romero Thu, 4 Feb 2016 02:32:19 +0000 (03:32 +0100)

gitk: Follow themed bgcolor in help dialogs

Make Help > About & Key bindings dialogs readable if theme
has changed font color to something incompatible with white.

Signed-off-by: Guillermo S. Romero <gsromero@infernal-iceberg.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: fr.po: Sync translations with gitJean-Noel Avila Fri, 29 Jan 2016 20:21:35 +0000 (21:21 +0100)

gitk: fr.po: Sync translations with git

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Update French translation (311t)Jean-Noel Avila Fri, 29 Jan 2016 20:21:34 +0000 (21:21 +0100)

gitk: Update French translation (311t)

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Update German translationRalf Thielow Fri, 12 Feb 2016 18:40:39 +0000 (19:40 +0100)

gitk: Update German translation

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Update Bulgarian translation (311t)Alexander Shopov Sat, 19 Dec 2015 22:36:09 +0000 (00:36 +0200)

gitk: Update Bulgarian translation (311t)

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envJeff King Wed, 16 Mar 2016 00:56:52 +0000 (20:56 -0400)

t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env

We set GIT_CONFIG_NOSYSTEM in our test scripts so that we do
not accidentally read /etc/gitconfig and have it influence
the outcome of the tests. But when running smart-http tests,
Apache will clean the environment, including this variable,
and the "server" side of our http operations will read it.

You can see this breakage by doing something like:

make
./git config --system http.getanyfile false
make test

which will cause t5561 to fail when it tests the
fallback-to-dumb operation.

We can fix this by instructing Apache to pass through the
variable. Unlike with other variables (e.g., 89c57ab3's
GIT_TRACE), we don't need to set a dummy value to prevent
warnings from Apache. test-lib.sh already makes sure that
GIT_CONFIG_NOSYSTEM is set and exported.

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

credential-cache--daemon: clarify "exit" action semanticsJeff King Fri, 18 Mar 2016 06:12:01 +0000 (02:12 -0400)

credential-cache--daemon: clarify "exit" action semantics

When this code was originally written, there wasn't much
thought given to the timing between a client asking for
"exit", the daemon signaling that the action is done (with
EOF), and the actual cleanup of the socket.

However, we need to care about this so that our test scripts
do not end up racy (e.g., by asking for an exit and checking
that the socket was cleaned up). The code that is already
there happens to behave very reasonably; let's add a comment
to make it clear that any changes should retain the same
behavior.

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

send-email: ignore trailing whitespace in mailrc alias... Jeff King Thu, 17 Mar 2016 23:58:22 +0000 (19:58 -0400)

send-email: ignore trailing whitespace in mailrc alias file

The regex for parsing mailrc considers everything after the
second whitespace to be the email address, up to the end of
the line. We have to include whitespace there, because you
may have multiple space-separated addresses, each with their
own internal quoting.

But if there is trailing whitespace, we include that, too.
This confuses quotewords() when we try to split the
individual addresses, and we end up storing "undef" in our
alias list. Later parts of the code then access that,
generating perl warnings.

Let's tweak our regex to throw away any trailing whitespace
on each line.

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

RelNotes: remove the mention of !reinclusionJunio C Hamano Fri, 18 Mar 2016 18:10:53 +0000 (11:10 -0700)

RelNotes: remove the mention of !reinclusion

We will be postponing this to a later cycle.

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

Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano Fri, 18 Mar 2016 18:06:15 +0000 (11:06 -0700)

Revert "Merge branch 'nd/exclusion-regression-fix'"

This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing
changes made to e79112d21024beb997951381db21a70b087d459d.

We will be postponing nd/exclusion-regression-fix topic to later
cycle.

Revert "Merge branch 'jc/exclusion-doc'"Junio C Hamano Fri, 18 Mar 2016 18:05:23 +0000 (11:05 -0700)

Revert "Merge branch 'jc/exclusion-doc'"

This reverts commit e80aae51f2be908e37fca47ea0dff6d7861c8497, reversing
changes made to 68846a92eafa6b2bfae778d0a656443a9fa61e59.

We will be postponing nd/exclusion-regression-fix topic to later
cycle.

Sync with Git 2.7.4Junio C Hamano Thu, 17 Mar 2016 19:54:17 +0000 (12:54 -0700)

Sync with Git 2.7.4

* maint:
Git 2.7.4
Git 2.6.6
Git 2.5.5
Git 2.4.11

Git 2.7.4 v2.7.4Junio C Hamano Thu, 17 Mar 2016 18:32:13 +0000 (11:32 -0700)

Git 2.7.4

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

l10n: de.po: add missing newlinesRalf Thielow Thu, 17 Mar 2016 18:31:33 +0000 (19:31 +0100)

l10n: de.po: add missing newlines

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

Sync with Git 2.6.6Junio C Hamano Thu, 17 Mar 2016 18:28:52 +0000 (11:28 -0700)

Sync with Git 2.6.6

* maint-2.6:
Git 2.6.6
Git 2.5.5
Git 2.4.11

Git 2.6.6 v2.6.6Junio C Hamano Thu, 17 Mar 2016 17:56:06 +0000 (10:56 -0700)

Git 2.6.6

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

Merge branch 'maint-2.5' into maint-2.6Junio C Hamano Thu, 17 Mar 2016 18:26:18 +0000 (11:26 -0700)

Merge branch 'maint-2.5' into maint-2.6

* maint-2.5:
Git 2.5.5
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow

Git 2.5.5 v2.5.5Junio C Hamano Thu, 17 Mar 2016 17:28:50 +0000 (10:28 -0700)

Git 2.5.5

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

Merge branch 'maint-2.4' into maint-2.5Junio C Hamano Thu, 17 Mar 2016 18:24:14 +0000 (11:24 -0700)

Merge branch 'maint-2.4' into maint-2.5

* maint-2.4:
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow

Git 2.4.11 v2.4.11Junio C Hamano Thu, 17 Mar 2016 17:00:44 +0000 (10:00 -0700)

Git 2.4.11

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

Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano Thu, 17 Mar 2016 16:55:54 +0000 (09:55 -0700)

Merge branch 'jk/path-name-safety-2.4' into maint-2.4

Bugfix patches were backported from the 'master' front to plug heap
corruption holes, to catch integer overflow in the computation of
pathname lengths, and to get rid of the name_path API. Both of
these would have resulted in writing over an under-allocated buffer
when formulating pathnames while tree traversal.

* jk/path-name-safety-2.4:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow

l10n: de.po: translate 22 new messagesRalf Thielow Tue, 15 Mar 2016 17:09:23 +0000 (18:09 +0100)

l10n: de.po: translate 22 new messages

Translate 22 new messages came from git.pot update in f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>

Git 2.8-rc3 v2.8.0-rc3Junio C Hamano Wed, 16 Mar 2016 21:00:18 +0000 (14:00 -0700)

Git 2.8-rc3

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

Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano Wed, 16 Mar 2016 21:13:25 +0000 (14:13 -0700)

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

* 'master' of git://bogomips.org/git-svn:
git-svn: fix URL canonicalization during init w/ SVN 1.7+
t9117: test specifying full url to git svn init -T

Sync with maintJunio C Hamano Wed, 16 Mar 2016 20:17:38 +0000 (13:17 -0700)

Sync with maint

* maint:
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow

Merge branch 'jc/sane-grep'Junio C Hamano Wed, 16 Mar 2016 20:16:54 +0000 (13:16 -0700)

Merge branch 'jc/sane-grep'

Recent versions of GNU grep is pickier than before to decide if a
file is "binary" and refuse to give line-oriented hits when we
expect it to, unless explicitly told with "-a" option. As our
scripted Porcelains use sane_grep wrapper for line-oriented data,
even when the line may contain non-ASCII payload we took from
end-user data, use "grep -a" to implement sane_grep wrapper when
using an implementation of "grep" that takes the "-a" option.

* jc/sane-grep:
rebase-i: clarify "is this commit relevant?" test
sane_grep: pass "-a" if grep accepts it

Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano Wed, 16 Mar 2016 20:16:40 +0000 (13:16 -0700)

Merge branch 'cn/deprecate-ssh-git-url'

The two alternative ways to spell "ssh://" transport have been
deprecated for a long time. The last mention of them has finally
removed from the documentation.

* cn/deprecate-ssh-git-url:
Disown ssh+git and git+ssh