git/git.git
5 years agoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
Junio C Hamano [Sun, 3 Apr 2016 17:29:33 +0000 (10:29 -0700)]
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

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

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

5 years agoMerge branch 'jc/index-pack'
Junio C Hamano [Sun, 3 Apr 2016 17:29:31 +0000 (10:29 -0700)]
Merge branch 'jc/index-pack'

Code clean-up.

* jc/index-pack:
  index-pack: add a helper function to derive .idx/.keep filename

5 years agoMerge branch 'gf/fetch-pack-direct-object-fetch'
Junio C Hamano [Sun, 3 Apr 2016 17:29:29 +0000 (10:29 -0700)]
Merge branch 'gf/fetch-pack-direct-object-fetch'

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

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

5 years agoMerge branch 'jc/maint-index-pack-keep'
Junio C Hamano [Sun, 3 Apr 2016 17:29:29 +0000 (10:29 -0700)]
Merge branch 'jc/maint-index-pack-keep'

"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

* jc/maint-index-pack-keep:
  index-pack: correct --keep[=<msg>]

5 years agoMerge branch 'mm/lockfile-error-message'
Junio C Hamano [Sun, 3 Apr 2016 17:29:27 +0000 (10:29 -0700)]
Merge branch 'mm/lockfile-error-message'

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

5 years agoMerge branch 'jk/rev-parse-local-env-vars'
Junio C Hamano [Sun, 3 Apr 2016 17:29:26 +0000 (10:29 -0700)]
Merge branch 'jk/rev-parse-local-env-vars'

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

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

5 years agoMerge branch 'jk/config-get-urlmatch'
Junio C Hamano [Sun, 3 Apr 2016 17:29:26 +0000 (10:29 -0700)]
Merge branch 'jk/config-get-urlmatch'

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

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

5 years agoMerge branch 'jk/add-i-highlight'
Junio C Hamano [Sun, 3 Apr 2016 17:29:25 +0000 (10:29 -0700)]
Merge branch 'jk/add-i-highlight'

* jk/add-i-highlight:
  add--interactive: allow custom diff highlighting programs

5 years agoMerge branch 'jk/credential-clear-config'
Junio C Hamano [Sun, 3 Apr 2016 17:29:24 +0000 (10:29 -0700)]
Merge branch 'jk/credential-clear-config'

The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line.  As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.

* jk/credential-clear-config:
  credential: let empty credential specs reset helper list

5 years agoMerge branch 'mp/upload-pack-use-embedded-args'
Junio C Hamano [Sun, 3 Apr 2016 17:29:23 +0000 (10:29 -0700)]
Merge branch 'mp/upload-pack-use-embedded-args'

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

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

5 years agoMerge branch 'mm/diff-renames-default'
Junio C Hamano [Sun, 3 Apr 2016 17:29:22 +0000 (10:29 -0700)]
Merge branch 'mm/diff-renames-default'

The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.

* mm/diff-renames-default:
  diff: activate diff.renames by default
  log: introduce init_log_defaults()
  t: add tests for diff.renames (true/false/unset)
  t4001-diff-rename: wrap file creations in a test
  Documentation/diff-config: fix description of diff.renames

5 years agoMerge branch 'mm/readme-markdown'
Junio C Hamano [Sun, 3 Apr 2016 17:27:22 +0000 (10:27 -0700)]
Merge branch 'mm/readme-markdown'

Fix a few broken links in README.md and also teach rpmbuild
that there is no README.

* mm/readme-markdown:
  README.md: don't take 'commandname' literally
  git.spec.in: use README.md, not README

5 years agoREADME.md: don't take 'commandname' literally
Matthieu Moy [Sat, 27 Feb 2016 10:46:12 +0000 (11:46 +0100)]
README.md: don't take 'commandname' literally

The link to Documentation/git-commandname.txt was obviously broken.
Remove the link and make it clear that it is not a literal path name by
using *italics* in makdown.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agogit.spec.in: use README.md, not README
Matthieu 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>
5 years agoGit 2.8 v2.8.0
Junio 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>
5 years agoMerge 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

5 years agoMerge 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

5 years agoMerge 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

5 years agoMerge branch 'master' of git://github.com/git-l10n/git-po
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

5 years agoDocumentation: fix git-p4 AsciiDoc formatting
Lars 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>
5 years agomingw: skip some tests in t9115 due to file name issues
Johannes 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>
5 years agot1300: fix the new --show-origin tests on Windows
Johannes 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>
5 years agot1300-repo-config: make it resilient to being run via 'sh -x'
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>
5 years agoconfig --show-origin: report paths with forward slashes
Johannes 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>
5 years agoMerge branch 'master' of https://github.com/vnwildman/git
Jiang 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

5 years agoMerge branch 'master' of git://github.com/alexhenrie/git-po
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

5 years agosubmodule: fix regression for deinit without submodules
Stefan 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>
5 years agol10n: pt_PT: Update and add new translations
Vasco 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>
5 years agol10n: ca.po: update translation
Alex 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>
5 years agoGit 2.8-rc4 v2.8.0-rc4
Junio 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>
5 years agoSync with maint
Junio 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

5 years agoMerge branch 'mm/doc-hooks-linkgit-fix' into maint
Junio 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

5 years agoDocumentation: fix broken linkgit to git-config
Matthieu 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>
5 years agoDocumentation: use ASCII quotation marks in git-p4
Lars 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>
5 years agoMerge 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"

5 years agoRevert "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>
5 years agoMerge branch 'es/st-add4-gcc-4.2-workaround' into maint
Junio 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

5 years agogit-compat-util: st_add4: work around gcc 4.2.x compiler crash
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>
5 years agoMerge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po
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

5 years agoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
Junio 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)

5 years agol10n: vi.po (2530t): Update translation
Tran 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>
5 years agol10n: zh_CN: review for git v2.8.0 l10n round 2
Ray 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>
5 years agogitk: Follow themed bgcolor in help dialogs
Guillermo 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>
5 years agogitk: fr.po: Sync translations with git
Jean-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>
5 years agogitk: 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>
5 years agogitk: Update German translation
Ralf 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>
5 years agogitk: 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>
5 years agoRelNotes: remove the mention of !reinclusion
Junio 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>
5 years agoRevert "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.

5 years agoRevert "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.

5 years agoSync with Git 2.7.4
Junio 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

5 years agoGit 2.7.4 v2.7.4
Junio 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>
5 years agol10n: de.po: add missing newlines
Ralf 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>
5 years agoSync with Git 2.6.6
Junio 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

5 years agoGit 2.6.6 v2.6.6
Junio 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>
5 years agoMerge branch 'maint-2.5' into maint-2.6
Junio 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

5 years agoGit 2.5.5 v2.5.5
Junio 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>
5 years agoMerge branch 'maint-2.4' into maint-2.5
Junio 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

5 years agoGit 2.4.11 v2.4.11
Junio 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>
5 years agoMerge branch 'jk/path-name-safety-2.4' into maint-2.4
Junio 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

5 years agol10n: de.po: translate 22 new messages
Ralf 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>
5 years agoGit 2.8-rc3 v2.8.0-rc3
Junio 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>
5 years agoMerge branch 'master' of git://bogomips.org/git-svn
Junio 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

5 years agoSync with maint
Junio 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

5 years agoMerge 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

5 years agoMerge 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

5 years agogit-svn: fix URL canonicalization during init w/ SVN 1.7+
Eric Wong [Wed, 16 Mar 2016 20:14:08 +0000 (20:14 +0000)]
git-svn: fix URL canonicalization during init w/ SVN 1.7+

URL canonicalization when full URLs are passed became broken
when using SVN::_Core::svn_dirent_canonicalize under SVN 1.7.

Ensure we canonicalize paths and URLs with appropriate functions
for each type from now on as the path/URL-agnostic
SVN::_Core::svn_path_canonicalize function is deprecated in SVN.

Tested with the following commands:

  git svn init -T svn://svn.code.sf.net/p/squirrelmail/code/trunk
  git svn init -b svn://svn.code.sf.net/p/squirrelmail/code/branches

Reported-by: Adam Dinwoodie <adam@dinwoodie.org>
  http://mid.gmane.org/20160315162344.GM29016@dinwoodie.org
Signed-off-by: Eric Wong <normalperson@yhbt.net>
5 years agoMerge branch 'jk/path-name-safety-2.7' into maint
Junio C Hamano [Wed, 16 Mar 2016 20:15:04 +0000 (13:15 -0700)]
Merge branch 'jk/path-name-safety-2.7' into maint

* jk/path-name-safety-2.7:
  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

5 years agot9117: test specifying full url to git svn init -T
Adam Dinwoodie [Wed, 16 Mar 2016 19:09:54 +0000 (19:09 +0000)]
t9117: test specifying full url to git svn init -T

According to the documentation, full URLs can be specified in the `-T`
argument to `git svn init`.  However, the canonicalization of such
arguments squashes together consecutive "/"s, which unsurprisingly
breaks http://, svn://, etc URLs.  Add a failing test case to provide
evidence of that.

On systems where Subversion provides svn_path_canonicalize but not
svn_dirent_canonicalize (Subversion 1.6 and earlier?), this test passes,
as svn_path_canonicalize doesn't mangle the consecutive "/"s.

[ew: fixed whitespace]

Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
5 years agoMerge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7
Junio C Hamano [Wed, 16 Mar 2016 17:42:32 +0000 (10:42 -0700)]
Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7

* jk/path-name-safety-2.6:
  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

5 years agoMerge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6
Junio C Hamano [Wed, 16 Mar 2016 17:42:02 +0000 (10:42 -0700)]
Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6

* jk/path-name-safety-2.5:
  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

5 years agoMerge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5
Junio C Hamano [Wed, 16 Mar 2016 17:41:43 +0000 (10:41 -0700)]
Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5

* 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

5 years agolist-objects: pass full pathname to callbacks
Jeff King [Thu, 11 Feb 2016 22:28:36 +0000 (17:28 -0500)]
list-objects: pass full pathname to callbacks

When we find a blob at "a/b/c", we currently pass this to
our show_object_fn callbacks as two components: "a/b/" and
"c". Callbacks which want the full value then call
path_name(), which concatenates the two. But this is an
inefficient interface; the path is a strbuf, and we could
simply append "c" to it temporarily, then roll back the
length, without creating a new copy.

So we could improve this by teaching the callsites of
path_name() this trick (and there are only 3). But we can
also notice that no callback actually cares about the
broken-down representation, and simply pass each callback
the full path "a/b/c" as a string. The callback code becomes
even simpler, then, as we do not have to worry about freeing
an allocated buffer, nor rolling back our modification to
the strbuf.

This is theoretically less efficient, as some callbacks
would not bother to format the final path component. But in
practice this is not measurable. Since we use the same
strbuf over and over, our work to grow it is amortized, and
we really only pay to memcpy a few bytes.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agolist-objects: drop name_path entirely
Jeff King [Thu, 11 Feb 2016 22:26:44 +0000 (17:26 -0500)]
list-objects: drop name_path entirely

In the previous commit, we left name_path as a thin wrapper
around a strbuf. This patch drops it entirely. As a result,
every show_object_fn callback needs to be adjusted. However,
none of their code needs to be changed at all, because the
only use was to pass it to path_name(), which now handles
the bare strbuf.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agolist-objects: convert name_path to a strbuf
Jeff King [Thu, 11 Feb 2016 22:26:18 +0000 (17:26 -0500)]
list-objects: convert name_path to a strbuf

The "struct name_path" data is examined in only two places:
we generate it in process_tree(), and we convert it to a
single string in path_name(). Everyone else just passes it
through to those functions.

We can further note that process_tree() already keeps a
single strbuf with the leading tree path, for use with
tree_entry_interesting().

Instead of building a separate name_path linked list, let's
just use the one we already build in "base". This reduces
the amount of code (especially tricky code in path_name()
which did not check for integer overflows caused by deep
or large pathnames).

It is also more efficient in some instances.  Any time we
were using tree_entry_interesting, we were building up the
strbuf anyway, so this is an immediate and obvious win
there. In cases where we were not, we trade off storing
"pathname/" in a strbuf on the heap for each level of the
path, instead of two pointers and an int on the stack (with
one pointer into the tree object). On a 64-bit system, the
latter is 20 bytes; so if path components are less than that
on average, this has lower peak memory usage.  In practice
it probably doesn't matter either way; we are already
holding in memory all of the tree objects leading up to each
pathname, and for normal-depth pathnames, we are only
talking about hundreds of bytes.

This patch leaves "struct name_path" as a thin wrapper
around the strbuf, to avoid disrupting callbacks. We should
fix them, but leaving it out makes this diff easier to view.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoshow_object_with_name: simplify by using path_name()
Jeff King [Thu, 11 Feb 2016 22:24:18 +0000 (17:24 -0500)]
show_object_with_name: simplify by using path_name()

When "git rev-list" shows an object with its associated path
name, it does so by walking the name_path linked list and
printing each component (stopping at any embedded NULs or
newlines).

We'd like to eventually get rid of name_path entirely in
favor of a single buffer, and dropping this custom printing
code is part of that. As a first step, let's use path_name()
to format the list into a single buffer, and print that.
This is strictly less efficient than the original, but it's
a temporary step in the refactoring; our end game will be to
get the fully formatted name in the first place.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoadd helpers for detecting size_t overflow
Jeff King [Fri, 19 Feb 2016 11:21:19 +0000 (06:21 -0500)]
add helpers for detecting size_t overflow

Performing computations on size_t variables that we feed to
xmalloc and friends can be dangerous, as an integer overflow
can cause us to allocate a much smaller chunk than we
realized.

We already have unsigned_add_overflows(), but let's add
unsigned_mult_overflows() to that. Furthermore, rather than
have each site manually check and die on overflow, we can
provide some helpers that will:

  - promote the arguments to size_t, so that we know we are
    doing our computation in the same size of integer that
    will ultimately be fed to xmalloc

  - check and die on overflow

  - return the result so that computations can be done in
    the parameter list of xmalloc.

These functions are a lot uglier to use than normal
arithmetic operators (you have to do "st_add(foo, bar)"
instead of "foo + bar"). To at least limit the damage, we
also provide multi-valued versions. So rather than:

  st_add(st_add(a, b), st_add(c, d));

you can write:

  st_add4(a, b, c, d);

This isn't nearly as elegant as a varargs function, but it's
a lot harder to get it wrong. You don't have to remember to
add a sentinel value at the end, and the compiler will
complain if you get the number of arguments wrong. This
patch adds only the numbered variants required to convert
the current code base; we can easily add more later if
needed.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agohttp-push: stop using name_path
Jeff King [Thu, 11 Feb 2016 22:23:48 +0000 (17:23 -0500)]
http-push: stop using name_path

The graph traversal code here passes along a name_path to
build up the pathname at which we find each blob. But we
never actually do anything with the resulting names, making
it a waste of code and memory.

This usage came in aa1dbc9 (Update http-push functionality,
2006-03-07), and originally the result was passed to
"add_object" (which stored it, but didn't really use it,
either). But we stopped using that function in 1f1e895 (Add
"named object array" concept, 2006-06-19) in favor of
storing just the objects themselves.

Moreover, the generation of the name in process_tree() is
buggy. It sticks "name" onto the end of the name_path linked
list, and then passes it down again as it recurses (instead
of "entry.path"). So it's a good thing this was unused, as
the resulting path for "a/b/c/d" would end up as "a/a/a/a".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agotree-diff: catch integer overflow in combine_diff_path allocation
Jeff King [Fri, 19 Feb 2016 11:21:30 +0000 (06:21 -0500)]
tree-diff: catch integer overflow in combine_diff_path allocation

A combine_diff_path struct has two "flex" members allocated
alongside the struct: a string to hold the pathname, and an
array of parent pointers. We use an "int" to compute this,
meaning we may easily overflow it if the pathname is
extremely long.

We can fix this by using size_t, and checking for overflow
with the st_add helper.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git
Jiang Xin [Wed, 16 Mar 2016 16:11:54 +0000 (00:11 +0800)]
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git

* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
  l10n: fr.po v2.8.0 round 3

5 years agoMerge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko
Jiang Xin [Wed, 16 Mar 2016 16:11:13 +0000 (00:11 +0800)]
Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko

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

5 years agoMerge branch 'master' of git://github.com/nafmo/git-l10n-sv
Jiang Xin [Wed, 16 Mar 2016 16:10:23 +0000 (00:10 +0800)]
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (2530t0f0u)

5 years agol10n: ko.po: Update Korean translation
Changwoo Ryu [Wed, 16 Mar 2016 01:33:12 +0000 (10:33 +0900)]
l10n: ko.po: Update Korean translation

Signed-off-by: Changwoo Ryu <cwryu@debian.org>
5 years agol10n: fr.po v2.8.0 round 3
Jean-Noel Avila [Tue, 15 Mar 2016 22:01:59 +0000 (23:01 +0100)]
l10n: fr.po v2.8.0 round 3

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
5 years agol10n: sv.po: Update Swedish translation (2530t0f0u)
Peter Krefting [Tue, 15 Mar 2016 21:37:55 +0000 (22:37 +0100)]
l10n: sv.po: Update Swedish translation (2530t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
5 years agol10n: ru.po: update Russian translation
Dimitriy Ryazantcev [Tue, 15 Mar 2016 18:55:36 +0000 (20:55 +0200)]
l10n: ru.po: update Russian translation

Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
5 years agoRelNotes for 2.8.0: typofix
Junio C Hamano [Mon, 14 Mar 2016 18:11:25 +0000 (11:11 -0700)]
RelNotes for 2.8.0: typofix

Helped-by: Max Horn
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'svn-glob' of git://bogomips.org/git-svn
Junio C Hamano [Tue, 15 Mar 2016 17:32:20 +0000 (10:32 -0700)]
Merge branch 'svn-glob' of git://bogomips.org/git-svn

* 'svn-glob' of git://bogomips.org/git-svn:
  git-svn: shorten glob error message
  git-svn: loosen config globs limitations

5 years agoMerge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po
Junio C Hamano [Tue, 15 Mar 2016 17:13:15 +0000 (10:13 -0700)]
Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po

l10n-2.8.0-rnd2

* tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits)
  l10n: zh_CN: for git v2.8.0 l10n round 3
  l10n: git.pot: Add one new message for Git 2.8.0
  l10n: zh_CN: for git v2.8.0 l10n round 2
  l10n: fr.po v2.8.0 round 2
  l10n: ru.po: update Russian translation
  l10n: ko: Update Korean translation
  l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
  l10n: zh_CN: for git v2.8.0 l10n round 1
  l10n: de.po: translate 48 new messages
  l10n: de.po: translate "command" as "Befehl"
  l10n: de.po: fix interactive rebase message
  l10n: de.po: add space to abbreviation "z. B."
  l10n: de.po: fix typo
  l10n: TEAMS: update Ralf Thielow's email address
  l10n: sv.po: Update Swedish translation (2509t0f0u)
  l10n: sv.po: Fix inconsistent translation of "progress meter"
  l10n: ko.po: Update Korean translation
  l10n: ru.po: update Russian translation
  l10n: vi.po (2509t): Updated Vietnamese translation
  l10n: fr.po v2.8.0 round 1 2509t
  ...

5 years agol10n: zh_CN: for git v2.8.0 l10n round 3
Jiang Xin [Tue, 15 Mar 2016 16:27:40 +0000 (00:27 +0800)]
l10n: zh_CN: for git v2.8.0 l10n round 3

Update 1 new translations (2530t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
5 years agol10n: git.pot: Add one new message for Git 2.8.0
Jiang Xin [Tue, 15 Mar 2016 16:20:14 +0000 (00:20 +0800)]
l10n: git.pot: Add one new message for Git 2.8.0

Add one new message came from this commit:

df22724 wt-status: allow "ahead " to be picked up by l10n

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
5 years agoMerge branch 'master' of git://github.com/git-l10n/git-po
Jiang Xin [Tue, 15 Mar 2016 16:15:59 +0000 (00:15 +0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: for git v2.8.0 l10n round 2
  l10n: fr.po v2.8.0 round 2
  l10n: ru.po: update Russian translation
  l10n: ko: Update Korean translation
  l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
  l10n: zh_CN: for git v2.8.0 l10n round 1
  l10n: de.po: translate 48 new messages
  l10n: de.po: translate "command" as "Befehl"
  l10n: de.po: fix interactive rebase message
  l10n: de.po: add space to abbreviation "z. B."
  l10n: de.po: fix typo
  l10n: TEAMS: update Ralf Thielow's email address
  l10n: sv.po: Update Swedish translation (2509t0f0u)
  l10n: sv.po: Fix inconsistent translation of "progress meter"
  l10n: ko.po: Update Korean translation
  l10n: ru.po: update Russian translation
  l10n: vi.po (2509t): Updated Vietnamese translation
  l10n: fr.po v2.8.0 round 1 2509t
  l10n: fr.po: Correct case in sentence
  l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)

5 years agol10n: zh_CN: for git v2.8.0 l10n round 2
Jiang Xin [Sat, 12 Mar 2016 14:09:24 +0000 (22:09 +0800)]
l10n: zh_CN: for git v2.8.0 l10n round 2

Update 21 new translations (2529t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
5 years agogit-svn: shorten glob error message
Eric Wong [Thu, 14 Jan 2016 03:59:48 +0000 (03:59 +0000)]
git-svn: shorten glob error message

Error messages should attempt to fit within the confines of
an 80-column terminal to avoid compatibility and accessibility
problems.  Furthermore the word "directories" can be misleading
when used in the context of git refnames.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
5 years agogit-svn: loosen config globs limitations
Victor Leschuk [Mon, 11 Jan 2016 14:25:58 +0000 (17:25 +0300)]
git-svn: loosen config globs limitations

Expand the area of globs applicability for branches and tags
in git-svn. It is now possible to use globs like 'a*e', or 'release_*'.
This allows users to avoid long lines in config like:

branches = branches/{release_20,release_21,release_22,...}

In favor of:

branches = branches/release_*

[ew: amended commit message, minor formatting and style fixes]

Signed-off-by: Victor Leschuk <vleschuk@accesssoftek.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
5 years agol10n: fr.po v2.8.0 round 2
Jean-Noel Avila [Mon, 14 Mar 2016 19:26:53 +0000 (20:26 +0100)]
l10n: fr.po v2.8.0 round 2

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
5 years agoMerge branch 'mg/wt-status-mismarked-i18n'
Junio C Hamano [Mon, 14 Mar 2016 17:46:17 +0000 (10:46 -0700)]
Merge branch 'mg/wt-status-mismarked-i18n'

* mg/wt-status-mismarked-i18n:
  wt-status: allow "ahead " to be picked up by l10n

5 years agowt-status: allow "ahead " to be picked up by l10n
Michael J Gruber [Mon, 14 Mar 2016 15:30:33 +0000 (16:30 +0100)]
wt-status: allow "ahead " to be picked up by l10n

The extra pair of parentheses keeps the l10n engine from picking up the
string. Remove them so that "ahead " ends up in git.pot.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru
Jiang Xin [Sun, 13 Mar 2016 13:41:46 +0000 (21:41 +0800)]
Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

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

5 years agol10n: ru.po: update Russian translation
Dimitriy Ryazantcev [Sun, 13 Mar 2016 00:07:09 +0000 (02:07 +0200)]
l10n: ru.po: update Russian translation

Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>