summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-10-24Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitLibravatar Jiang Xin1-2414/+2557
* 'jx/zh_CN-proposed' of github.com:jiangxin/git: l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2
2017-10-24l10n: zh_CN: review for git v2.15.0 l10n round 2Libravatar Ray Chen1-2/+2
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2017-10-24l10n: zh_CN: for git v2.15.0 l10n round 2Libravatar Jiang Xin1-2414/+2557
Translate 69 messages (3245t0f0u) for git v2.15.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: 依云 <lilydjwg@gmail.com>
2017-10-24Merge branch 'master' of https://github.com/ralfth/git-po-deLibravatar Jiang Xin1-2448/+2630
* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: fix typos l10n: de.po: translate 70 new messages
2017-10-23l10n: de.po: fix typosLibravatar Andre Hinrichs1-14/+14
Signed-off-by: Andre Hinrichs <andre.hinrichs@gmx.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-10-23l10n: de.po: translate 70 new messagesLibravatar Ralf Thielow1-2435/+2617
Translate 70 new messages came from git.pot update in 25eab542b (l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78 (l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-10-22l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-50/+50
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-10-22Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-51/+55
* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2
2017-10-19Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitLibravatar Jiang Xin1-2427/+2612
* 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git: l10n: fr.po: v2.15.0 round 2 l10n: fr.po change translation of "First, rewinding" l10n: fr.po fix some mistakes
2017-10-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-55/+58
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3245t0f0u)
2017-10-19Merge branch 'master' of https://github.com/Softcatala/git-poLibravatar Jiang Xin1-3008/+2991
* 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation
2017-10-19Merge branch 'translation' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-50/+54
* 'translation' of https://github.com/ChrisADR/git-po: l10n: es.po: v2.15.0 round 2
2017-10-19l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Libravatar Tran Ngoc Quan1-51/+55
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-10-18l10n: sv.po: Update Swedish translation (3245t0f0u)Libravatar Peter Krefting1-55/+58
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-10-18l10n: fr.po: v2.15.0 round 2Libravatar Jean-Noel Avila1-2424/+2612
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-10-18l10n: fr.po change translation of "First, rewinding"Libravatar Nicolas Cornu1-2/+1
Signed-off-by: Nicolas Cornu <nicolac76@yahoo.fr>
2017-10-18l10n: fr.po fix some mistakesLibravatar Jean-Noel Avila1-7/+5
Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr> Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
2017-10-17l10n: Update Catalan translationLibravatar Jordi Mas1-3008/+2991
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-10-17l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu1-2411/+2535
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-10-16l10n: es.po: v2.15.0 round 2Libravatar Christopher Díaz Riveros1-50/+54
Spanish translation for v2.15.0 Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
2017-10-17l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)Libravatar Jiang Xin1-47/+48
Generate po/git.pot from v2.15.0-rc1 for git v2.15.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-10-17Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin7-12060/+29445
* 'master' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: bg.po: Updated Bulgarian translation (3245t) l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 l10n: es.po: Update translation v2.15.0 round 1 l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed) l10n: es.po: spanish added to TEAMS l10n: es.po: initial Spanish version git 2.14.0
2017-10-15l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-2381/+2521
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-10-14Merge branch 'master' of git://github.com/alshopov/git-poLibravatar Jiang Xin1-2419/+2554
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3245t)
2017-10-14l10n: bg.po: Updated Bulgarian translation (3245t)Libravatar Alexander Shopov1-2419/+2554
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-10-11l10n: sv.po: Update Swedish translation (3245t0f0u)Libravatar Peter Krefting1-2475/+2674
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-10-11Git 2.15-rc1Libravatar Junio C Hamano2-1/+18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-11Merge branch 'ls/filter-process-delayed'Libravatar Junio C Hamano1-36/+52
Bugfixes to an already graduated series. * ls/filter-process-delayed: write_entry: untangle symlink and regular-file cases write_entry: avoid reading blobs in CE_RETRY case write_entry: fix leak when retrying delayed filter entry.c: check if file exists after checkout entry.c: update cache entry only for existing files
2017-10-11Merge branch 'ds/avoid-overflow-in-midpoint-computation'Libravatar Junio C Hamano12-15/+15
Code clean-up. * ds/avoid-overflow-in-midpoint-computation: cleanup: fix possible overflow errors in binary search
2017-10-11Merge branch 'tb/complete-describe'Libravatar Junio C Hamano1-1/+1
Docfix. * tb/complete-describe: completion: add --broken and --dirty to describe
2017-10-11Merge branch 'sb/test-cmp-expect-actual'Libravatar Junio C Hamano14-41/+41
Test tweak. * sb/test-cmp-expect-actual: tests: fix diff order arguments in test_cmp
2017-10-11Merge branch 'jk/refs-df-conflict'Libravatar Junio C Hamano4-3/+50
An ancient bug that made Git misbehave with creation/renaming of refs has been fixed. * jk/refs-df-conflict: refs_resolve_ref_unsafe: handle d/f conflicts for writes t3308: create a real ref directory/file conflict
2017-10-11Merge branch 'rs/rs-mailmap'Libravatar Junio C Hamano1-0/+1
* rs/rs-mailmap: .mailmap: normalize name for René Scharfe
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Libravatar Junio C Hamano2-4/+26
Improve behaviour of "git fsck" upon finding a missing object. * rs/fsck-null-return-from-lookup: fsck: handle NULL return of lookup_blob() and lookup_tree()
2017-10-11Merge branch 'jk/sha1-loose-object-info-fix'Libravatar Junio C Hamano1-2/+6
Leakfix and futureproofing. * jk/sha1-loose-object-info-fix: sha1_loose_object_info: handle errors from unpack_sha1_rest
2017-10-11Merge branch 'hn/string-list-doc'Libravatar Junio C Hamano1-1/+1
Docfix. * hn/string-list-doc: api-argv-array.txt: remove broken link to string-list API
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Libravatar Junio C Hamano4-17/+122
"git for-each-ref --format=..." learned a new format element, %(trailers), to show only the commit log trailer part of the log message. * tb/show-trailers-in-ref-filter: ref-filter.c: parse trailers arguments with %(contents) atom ref-filter.c: use trailer_opts to format trailers t6300: refactor %(trailers) tests doc: use "`<literal>`"-style quoting for literal strings doc: 'trailers' is the preferred way to format trailers t4205: unfold across multiple lines
2017-10-11Merge branch 'jt/oidmap'Libravatar Junio C Hamano6-31/+133
Introduce a new "oidmap" API and rewrite oidset to use it. * jt/oidmap: oidmap: map with OID as key
2017-10-11Merge branch 'jr/hash-migration-plan-doc'Libravatar Junio C Hamano2-0/+798
Lay out plans for weaning us off of SHA-1. * jr/hash-migration-plan-doc: technical doc: add a design doc for hash function transition
2017-10-11Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-2425/+2598
* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0
2017-10-10write_entry: untangle symlink and regular-file casesLibravatar Jeff King1-31/+40
The write_entry() function switches on the mode of the entry we're going to write out. The cases for S_IFLNK and S_IFREG are lumped together. In earlier versions of the code, this made some sense. They have a shared preamble (which reads the blob content), a short type-specific body, and a shared conclusion (which writes out the file contents; always for S_IFREG and only sometimes for S_IFLNK). But over time this has grown to make less sense. The preamble now has conditional bits for each type, and the S_IFREG body has grown a lot more complicated. It's hard to follow the logic of which code is running for which mode. Let's give each mode its own case arm. We will still share the conclusion code, which means we now jump to it with a goto. Ideally we'd pull that shared code into its own function, but it touches so much internal state in the write_entry() function that the end result is actually harder to follow than the goto. While we're here, we'll touch up a few bits of whitespace to make the beginning and endings of the cases easier to read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-10write_entry: avoid reading blobs in CE_RETRY caseLibravatar Jeff King1-11/+14
When retrying a delayed filter-process request, we don't need to send the blob to the filter a second time. However, we read it unconditionally into a buffer, only to later throw away that buffer. We can make this more efficient by skipping the read in the first place when it isn't necessary. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-10write_entry: fix leak when retrying delayed filterLibravatar Jeff King1-0/+1
When write_entry() retries a delayed filter request, we don't need to send the blob content to the filter again, and set the pointer to NULL. But doing so means we leak the contents we read earlier from read_blob_entry(). Let's make sure to free it before dropping the pointer. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-10cleanup: fix possible overflow errors in binary searchLibravatar Derrick Stolee12-15/+15
A common mistake when writing binary search is to allow possible integer overflow by using the simple average: mid = (min + max) / 2; Instead, use the overflow-safe version: mid = min + (max - min) / 2; This translation is safe since the operation occurs inside a loop conditioned on "min < max". The included changes were found using the following git grep: git grep '/ *2;' '*.c' Making this cleanup will prevent future review friction when a new binary search is contructed based on existing code. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-09Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-1/+1
* js/rebase-i-final: i18n: add a missing space in message
2017-10-09i18n: add a missing space in messageLibravatar Jean-Noel Avila1-1/+1
The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-09l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0Libravatar Tran Ngoc Quan1-2425/+2598
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-10-08l10n: es.po: Update translation v2.15.0 round 1Libravatar Christopher Díaz1-2732/+3574
Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
2017-10-08Merge branch 'maint' of git://github.com/git-l10n/git-poLibravatar Jiang Xin2-0/+15757
* 'maint' of git://github.com/git-l10n/git-po: l10n: es.po: spanish added to TEAMS l10n: es.po: initial Spanish version git 2.14.0
2017-10-08l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)Libravatar Jiang Xin1-2360/+2499
Generate po/git.pot from commit d35688db19 ("Prepare for -rc1", 2017-10-07) for git v2.15.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:25:02 +0000