Commit Graph

42429 Commits

Author SHA1 Message Date
Jiang Xin
13857b23e2 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
2016-03-17 00:11:13 +08:00
Jiang Xin
6821537c25 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)
2016-03-17 00:10:23 +08:00
Changwoo Ryu
0cb61997a4 l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-03-16 10:33:12 +09:00
Jean-Noel Avila
23508cbbc2 l10n: fr.po v2.8.0 round 3
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-03-15 23:01:59 +01:00
Peter Krefting
aaa89ad442 l10n: sv.po: Update Swedish translation (2530t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-03-15 22:37:55 +01:00
Dimitriy Ryazantcev
da0e97de21 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-03-15 20:55:36 +02:00
Junio C Hamano
c2c5f6b1e4 RelNotes for 2.8.0: typofix
Helped-by: Max Horn
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-15 10:58:59 -07:00
Junio C Hamano
a7206ba7f3 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
2016-03-15 10:32:20 -07:00
Junio C Hamano
e7c1132c0f l10n-2.8.0-rnd2
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJW6Dy/AAoJEMek6Rt1RHooAuYP/3LntWhaf3RE/1h1DNILwtzF
 D8wZZ4q8KAuUNFj4gJDuUE2cLjSP1KR0ilTHpeH/3zadE3ZahMfGuAkZTWq2rnEb
 MtRpv1yevcWkL10JrmTDKX3FYu4ZdUoDJgEhIlnMML1v2K7jB066sPyB3syJjhkI
 RdjOyoaxnZXK3pMb2O81KM01U/k9cECsFyjLAfa6n1jdldC0SuFodmzi3g8kvvth
 9qsBJV6EKtBUy/KWoe9kpLmG6c/8bNY+14NOOnevsnXJCIiOTPH/ZP6TgzcuX2yH
 ji+Gf7YXW3HEQY3X5zVRL7K84x/NKau7mO8WTVW7W650etNoXiUVVy9MOh4tusEo
 HTURZJaivnfpS3/HYXWT0AjUuJqKqjXeuBuyuXe0ykvNfCMoobSJxA+liBc2oZtk
 E4WsWobeSyMETZ0Z6B1DVAPWyhVoTh228IS30F2woTWy4pTCSkWSHc4/lm0vvrid
 XxM4O/qDUJ+sPh2Ub7rovQXOxx4PfZIFo9/Of3Lika/Nw4TpFKsrztew4yiSZTNO
 YDp5Q3IvsxdPNUjRK6YONFfvYRvYpsXGBdquw6Upe/qDcW+h2txY5yCrr/VW5Aax
 QuevojS50vOZHkSZUNjKr0DarNcknPZEZFk9PF1QKOUR64AgIT5mMcMXHZd8vfPR
 0bltnYrQTRnauAlHkM62
 =aUQK
 -----END PGP SIGNATURE-----

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
  ...
2016-03-15 10:13:15 -07:00
Jiang Xin
5c0c220c53 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>
2016-03-16 00:27:40 +08:00
Jiang Xin
a5a41683dc 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>
2016-03-16 00:20:14 +08:00
Jiang Xin
531f756a36 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)
2016-03-16 00:15:59 +08:00
Jiang Xin
3495628d4b 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>
2016-03-16 00:07:06 +08:00
Eric Wong
62335bbbc7 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>
2016-03-15 01:35:39 +00:00
Victor Leschuk
e4e5dd94e6 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>
2016-03-15 01:35:38 +00:00
Jean-Noel Avila
7a2c7e58dc l10n: fr.po v2.8.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-03-14 20:29:04 +01:00
Junio C Hamano
db6696f653 Merge branch 'mg/wt-status-mismarked-i18n'
* mg/wt-status-mismarked-i18n:
  wt-status: allow "ahead " to be picked up by l10n
2016-03-14 10:46:17 -07:00
Michael J Gruber
df227241dd 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>
2016-03-14 10:45:04 -07:00
Jiang Xin
a08823768e 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
2016-03-13 21:41:46 +08:00
Dimitriy Ryazantcev
f3aeef1170 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-03-13 02:07:09 +02:00
Changwoo Ryu
03ac0e5fff l10n: ko: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-03-13 02:32:52 +09:00
Jiang Xin
f1522b2770 l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)
Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-12 22:05:35 +08:00
Jiang Xin
7174c116bb 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 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)
2016-03-12 22:04:39 +08:00
Jiang Xin
276ceeaa49 l10n: zh_CN: for git v2.8.0 l10n round 1
Update 48 new translations (2509t0f0u) for git v2.8.0-rc0.

Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: zh_CN: review for git v2.8.0 l10n round 1
2016-03-12 22:00:34 +08:00
Junio C Hamano
214123c645 rebase-i: clarify "is this commit relevant?" test
While I was checking all the call sites of sane_grep and sane_egrep,
I noticed this one is somewhat strangely written.  The lines in the
file sane_grep works on all begin with 40-hex object name, so there
is no real risk of confusing "test $(...) = ''" by finding something
that begins with a dash, but using the status from sane_grep makes
it a lot clearer what is going on.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-10 15:35:48 -08:00
Junio C Hamano
71b401032b sane_grep: pass "-a" if grep accepts it
Newer versions of GNU grep is reported to be pickier when we feed a
non-ASCII input and break some Porcelain scripts.  As we know we do
not feed random binary file to our own sane_grep wrapper, allow us
to always pass "-a" by setting SANE_TEXT_GREP=-a Makefile variable
to work it around.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-10 15:35:43 -08:00
Junio C Hamano
ed9067f705 Git 2.8-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-10 11:16:23 -08:00
Junio C Hamano
5d1847b760 Sync with 2.7.3 2016-03-10 11:15:50 -08:00
Junio C Hamano
594730e980 Git 2.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-10 11:14:08 -08:00
Junio C Hamano
2e1e569d0e Merge branch 'ma/update-hooks-sample-typofix' into maint
* ma/update-hooks-sample-typofix:
  templates/hooks: fix minor typo in the sample update-hook
2016-03-10 11:13:50 -08:00
Junio C Hamano
3e6e43e130 Merge branch 'dt/initial-ref-xn-commit-doc' into maint
* dt/initial-ref-xn-commit-doc:
  refs: document transaction semantics
2016-03-10 11:13:49 -08:00
Junio C Hamano
4da402695d Merge branch 'ps/plug-xdl-merge-leak' into maint
* ps/plug-xdl-merge-leak:
  xdiff/xmerge: fix memory leak in xdl_merge
2016-03-10 11:13:49 -08:00
Junio C Hamano
08e21c9b5f Merge branch 'ak/git-strip-extension-from-dashed-command' into maint
Code simplification.

* ak/git-strip-extension-from-dashed-command:
  git.c: simplify stripping extension of a file in handle_builtin()
2016-03-10 11:13:48 -08:00
Junio C Hamano
c6f399c96f Merge branch 'ak/extract-argv0-last-dir-sep' into maint
Code simplification.

* ak/extract-argv0-last-dir-sep:
  exec_cmd.c: use find_last_dir_sep() for code simplification
2016-03-10 11:13:47 -08:00
Junio C Hamano
80047fa084 Merge branch 'jk/pack-idx-corruption-safety' into maint
The code to read the pack data using the offsets stored in the pack
idx file has been made more carefully check the validity of the
data in the idx.

* jk/pack-idx-corruption-safety:
  sha1_file.c: mark strings for translation
  use_pack: handle signed off_t overflow
  nth_packed_object_offset: bounds-check extended offset
  t5313: test bounds-checks of corrupted/malicious pack/idx files
2016-03-10 11:13:46 -08:00
Junio C Hamano
0e58b47d15 Merge branch 'js/config-set-in-non-repository' into maint
"git config section.var value" to set a value in per-repository
configuration file failed when it was run outside any repository,
but didn't say the reason correctly.

* js/config-set-in-non-repository:
  git config: report when trying to modify a non-existing repo config
2016-03-10 11:13:45 -08:00
Junio C Hamano
1191d606bb Merge branch 'sb/submodule-module-list-fix' into maint
A helper function "git submodule" uses since v2.7.0 to list the
modules that match the pathspec argument given to its subcommands
(e.g. "submodule add <repo> <path>") has been fixed.

* sb/submodule-module-list-fix:
  submodule helper list: respect correct path prefix
2016-03-10 11:13:45 -08:00
Junio C Hamano
7f18fadcbc Merge branch 'jk/grep-binary-workaround-in-test' into maint
Recent versions of GNU grep are pickier when their input contains
arbitrary binary data, which some of our tests uses.  Rewrite the
tests to sidestep the problem.

* jk/grep-binary-workaround-in-test:
  t9200: avoid grep on non-ASCII data
  t8005: avoid grep on non-ASCII data
2016-03-10 11:13:45 -08:00
Junio C Hamano
d4e7b9bcb0 Merge branch 'mm/push-simple-doc' into maint
The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.

* mm/push-simple-doc:
  Documentation/git-push: document that 'simple' is the default
2016-03-10 11:13:44 -08:00
Junio C Hamano
b7a6ec609f Merge branch 'jk/tighten-alloc' into maint
* jk/tighten-alloc: (23 commits)
  compat/mingw: brown paper bag fix for 50a6c8e
  ewah: convert to REALLOC_ARRAY, etc
  convert ewah/bitmap code to use xmalloc
  diff_populate_gitlink: use a strbuf
  transport_anonymize_url: use xstrfmt
  git-compat-util: drop mempcpy compat code
  sequencer: simplify memory allocation of get_message
  test-path-utils: fix normalize_path_copy output buffer size
  fetch-pack: simplify add_sought_entry
  fast-import: simplify allocation in start_packfile
  write_untracked_extension: use FLEX_ALLOC helper
  prepare_{git,shell}_cmd: use argv_array
  use st_add and st_mult for allocation size computation
  convert trivial cases to FLEX_ARRAY macros
  use xmallocz to avoid size arithmetic
  convert trivial cases to ALLOC_ARRAY
  convert manual allocations to argv_array
  argv-array: add detach function
  add helpers for allocating flex-array structs
  harden REALLOC_ARRAY and xcalloc against size_t overflow
  ...
2016-03-10 11:13:43 -08:00
Junio C Hamano
aa6c22ec43 Merge branch 'jk/more-comments-on-textconv' into maint
The memory ownership rule of fill_textconv() API, which was a bit
tricky, has been documented a bit better.

* jk/more-comments-on-textconv:
  diff: clarify textconv interface
2016-03-10 11:13:43 -08:00
Junio C Hamano
6044329cf1 Merge branch 'jk/no-diff-emit-common' into maint
"git merge-tree" used to mishandle "both sides added" conflict with
its own "create a fake ancestor file that has the common parts of
what both sides have added and do a 3-way merge" logic; this has
been updated to use the usual "3-way merge with an empty blob as
the fake common ancestor file" approach used in the rest of the
system.

* jk/no-diff-emit-common:
  xdiff: drop XDL_EMIT_COMMON
  merge-tree: drop generate_common strategy
  merge-one-file: use empty blob for add/add base
2016-03-10 11:13:42 -08:00
Junio C Hamano
28eec80b60 Merge branch 'jc/am-i-v-fix' into maint
The "v(iew)" subcommand of the interactive "git am -i" command was
broken in 2.6.0 timeframe when the command was rewritten in C.

* jc/am-i-v-fix:
  am -i: fix "v"iew
  pager: factor out a helper to prepare a child process to run the pager
  pager: lose a separate argv[]
2016-03-10 11:13:41 -08:00
Junio C Hamano
9c17ccaa49 Merge branch 'nd/git-common-dir-fix' into maint
"git rev-parse --git-common-dir" used in the worktree feature
misbehaved when run from a subdirectory.

* nd/git-common-dir-fix:
  rev-parse: take prefix into account in --git-common-dir
2016-03-10 11:13:40 -08:00
Junio C Hamano
8834ea375a Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint
"git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
rev, i.e. the object named by the the pathname with wildcard
characters in a tree object.

* nd/dwim-wildcards-as-pathspecs:
  get_sha1: don't die() on bogus search strings
  check_filename: tighten dwim-wildcard ambiguity
  checkout: reorder check_filename conditional
2016-03-10 11:13:39 -08:00
Junio C Hamano
fbef03d6ab Merge branch 'jk/epipe-in-async' into maint
Handling of errors while writing into our internal asynchronous
process has been made more robust, which reduces flakiness in our
tests.

* jk/epipe-in-async:
  t5504: handle expected output from SIGPIPE death
  test_must_fail: report number of unexpected signal
  fetch-pack: ignore SIGPIPE in sideband demuxer
  write_or_die: handle EPIPE in async threads
2016-03-10 11:13:38 -08:00
Junio C Hamano
2d5ff66c13 Merge branch 'ps/config-error' into maint
Many codepaths forget to check return value from git_config_set();
the function is made to die() to make sure we do not proceed when
setting a configuration variable failed.

* ps/config-error:
  config: rename git_config_set_or_die to git_config_set
  config: rename git_config_set to git_config_set_gently
  compat: die when unable to set core.precomposeunicode
  sequencer: die on config error when saving replay opts
  init-db: die on config errors when initializing empty repo
  clone: die on config error in cmd_clone
  remote: die on config error when manipulating remotes
  remote: die on config error when setting/adding branches
  remote: die on config error when setting URL
  submodule--helper: die on config error when cloning module
  submodule: die on config error when linking modules
  branch: die on config error when editing branch description
  branch: die on config error when unsetting upstream
  branch: report errors in tracking branch setup
  config: introduce set_or_die wrappers
2016-03-10 11:13:38 -08:00
Junio C Hamano
9bb71036f3 Merge branch 'mg/work-tree-tests' into maint
Traditionally, the tests that try commands that work on the
contents in the working tree were named with "worktree" in their
filenames, but with the recent addition of "git worktree"
subcommand, whose tests are also named similarly, it has become
harder to tell them apart.  The traditional tests have been renamed
to use "work-tree" instead in an attempt to differentiate them.

* mg/work-tree-tests:
  tests: rename work-tree tests to *work-tree*
2016-03-10 11:13:38 -08:00
Junio C Hamano
33b81b2d2e Merge branch 'sp/remote-curl-ssl-strerror' into maint
Help those who debug http(s) part of the system.

* sp/remote-curl-ssl-strerror:
  remote-curl: include curl_errorstr on SSL setup failures
2016-03-10 11:13:37 -08:00
Junio C Hamano
f4a48e8708 Merge branch 'jx/http-no-proxy'
* jx/http-no-proxy:
  http: honor no_http env variable to bypass proxy
2016-03-10 10:56:43 -08:00