summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-08-04Merge branch 'as/diff-options-grammofix'Libravatar Junio C Hamano1-1/+1
A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix
2017-08-02Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano9-15801/+17022
l10n for Git 2.14.0 round 2 * tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.14.0 l10n l10n: ko.po: Update Korean translation l10n: zh_CN: for git v2.14.0 l10n round 2 l10n: de.po: various fixes in German translation l10n: ru.po: update Russian translation l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations l10n: de.po: update German translation l10n: vi.po (3213t): Updated 9 new strings l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3213t)
2017-08-02l10n: zh_CN: review for git v2.14.0 l10nLibravatar Jiang Xin2-8/+10
Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-01Sync with v2.13.4Libravatar Junio C Hamano0-0/+0
2017-08-01Git 2.13.4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-01l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu1-13/+56
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-08-01l10n: zh_CN: for git v2.14.0 l10n round 2Libravatar Jiang Xin1-3165/+3147
Translate new l10n messages for git 2.14.0, and update translations on "stash". Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-31Sync with maintLibravatar Junio C Hamano1-0/+18
* maint: Preparation for 2.13.4 continues
2017-07-31Preparation for 2.13.4 continuesLibravatar Junio C Hamano1-0/+18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-31Merge branch 'ks/doc-fixes' into maintLibravatar Junio C Hamano2-10/+11
Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability
2017-07-31Merge branch 'jk/test-copy-bytes-fix' into maintLibravatar Junio C Hamano1-0/+1
A test fix. * jk/test-copy-bytes-fix: t: handle EOF in test_copy_bytes()
2017-07-31Merge branch 'pw/unquote-path-in-git-pm' into maintLibravatar Junio C Hamano3-43/+61
Code refactoring. * pw/unquote-path-in-git-pm: t9700: add tests for Git::unquote_path() Git::unquote_path(): throw an exception on bad path Git::unquote_path(): handle '\a' add -i: move unquote_path() to Git.pm
2017-07-31Merge branch 'jk/gc-pre-detach-under-hook' into maintLibravatar Junio C Hamano2-0/+25
We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. * jk/gc-pre-detach-under-hook: gc: run pre-detach operations under lock
2017-07-31Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintLibravatar Junio C Hamano1-3/+3
Code clean-up, that makes us in sync with Debian by one patch. * jn/hooks-pre-rebase-sample-fix: pre-rebase hook: capture documentation in a <<here document
2017-07-31Merge branch 'rs/progress-overall-throughput-at-the-end' into maintLibravatar Junio C Hamano1-2/+6
The progress meter did not give a useful output when we haven't had 0.5 seconds to measure the throughput during the interval. Instead show the overall throughput rate at the end, which is a much more useful number. * rs/progress-overall-throughput-at-the-end: progress: show overall rate in last update
2017-07-31Merge branch 'tb/push-to-cygwin-unc-path' into maintLibravatar Junio C Hamano5-0/+27
On Cygwin, similar to Windows, "git push //server/share/repository" ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. This may need to be heavily tested before it gets unleashed to the wild, as the change is at a fairly low-level code and would affect not just the code to decide if the push destination is local. There may be unexpected fallouts in the path normalization. * tb/push-to-cygwin-unc-path: cygwin: allow pushing to UNC paths
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintLibravatar Junio C Hamano1-4/+2
Code cleanup. * rs/apply-avoid-over-reading: apply: use strcmp(3) for comparing strings in gitdiff_verify_name() apply: use starts_with() in gitdiff_verify_name()
2017-07-31Merge branch 'js/blame-lib'Libravatar Junio C Hamano1-2/+4
A hotfix to a topic already in 'master'. * js/blame-lib: blame: fix memory corruption scrambling revision name in error message
2017-07-31diff-options doc: grammar fixLibravatar Anthony Sottile1-1/+1
Signed-off-by: Anthony Sottile <asottile@umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30l10n: de.po: various fixes in German translationLibravatar Hartmut Henkel1-27/+25
Signed-off-by: Hartmut Henkel <henkel@vh-s.de> Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2017-07-30Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruLibravatar Jiang Xin1-3027/+3137
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
2017-07-30l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-3027/+3137
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-07-27Merge branch 'master' of https://github.com/ralfth/git-po-deLibravatar Jiang Xin1-3010/+3181
* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: update German translation
2017-07-27Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/gitLibravatar Jiang Xin1-3038/+3222
* 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git: l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations
2017-07-27l10n: fr.po v2.14.0 rnd 2Libravatar Jean-Noel Avila1-3009/+3193
Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
2017-07-27l10n: fr.po Fix some french typosLibravatar Sylvestre Ledru1-17/+17
Signed-off-by: Sylvestre Ledru <sylvestre@debian.org>
2017-07-27l10n: fr.po Fix typoLibravatar Louis1-1/+1
Signed-off-by: Louis <spalax@gresille.org>
2017-07-27l10n: fr.po Fix some translationsLibravatar Hugues Peccatte1-13/+13
Signed-off-by: Hugues Peccatte <hugues.peccatte@aareon.fr> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-07-26l10n: de.po: update German translationLibravatar Ralf Thielow1-3010/+3181
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-07-26Merge branch 'master' of https://github.com/Softcatala/git-poLibravatar Jiang Xin1-3453/+4119
* 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation
2017-07-26Merge branch 'master' of git://github.com/alshopov/git-poLibravatar Jiang Xin1-17/+67
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3213t)
2017-07-25l10n: vi.po (3213t): Updated 9 new stringsLibravatar Tran Ngoc Quan1-50/+65
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-07-24Git 2.14-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-24blame: fix memory corruption scrambling revision name in error messageLibravatar SZEDER Gábor1-2/+4
When attempting to blame a non-existing path, git should show an error message like this: $ git blame e83c51633 -- nonexisting-file fatal: no such path nonexisting-file in e83c51633 Since the recent commit 835c49f7d (blame: rework methods that determine 'final' commit, 2017-05-24) the revision name is either missing or some scrambled characters are shown instead. The reason is that the revision name must be duplicated, because it is invalidated when the pending objects array is cleared in the meantime, but this commit dropped the duplication. Restore the duplication of the revision name in the affected functions (find_single_final() and find_single_initial()). Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-24Merge https://github.com/git-l10n/git-poLibravatar Junio C Hamano7-18800/+20664
* https://github.com/git-l10n/git-po: l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed) l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
2017-07-24l10n: Update Catalan translationLibravatar Jordi Mas1-3453/+4119
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-07-24l10n: bg.po: Updated Bulgarian translation (3213t)Libravatar Alexander Shopov1-17/+67
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-07-24l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Libravatar Jiang Xin1-10/+60
Generate po/git.pot from v2.14.0-rc0-40-g5eada8987e for git v2.14.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-24Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin7-18830/+20644
* 'master' of git://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
2017-07-22Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-3103/+3271
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3206t0f0u)
2017-07-21Sync with maintLibravatar Junio C Hamano1-0/+10
* maint: fixes from 'master' for 2.13.4
2017-07-21fixes from 'master' for 2.13.4Libravatar Junio C Hamano2-1/+11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-21Merge branch 'ew/fd-cloexec-fix' into maintLibravatar Junio C Hamano1-3/+3
Portability/fallback fix. * ew/fd-cloexec-fix: set FD_CLOEXEC properly when O_CLOEXEC is not supported
2017-07-21Merge branch 'ks/fix-rebase-doc-picture' into maintLibravatar Junio C Hamano1-1/+1
Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration
2017-07-21Merge branch 'js/alias-case-sensitivity' into maintLibravatar Junio C Hamano2-1/+8
A recent update broke an alias that contained an uppercase letter. * js/alias-case-sensitivity: alias: compare alias name *case-insensitively* t1300: demonstrate that CamelCased aliases regressed
2017-07-21Merge branch 'bb/unicode-10.0' into maintLibravatar Junio C Hamano1-13/+29
Update the character width tables. * bb/unicode-10.0: unicode: update the width tables to Unicode 10
2017-07-21Hopefully the final last-minute fix before -rc1Libravatar Junio C Hamano1-1/+11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-21Merge branch 'ks/doc-fixes'Libravatar Junio C Hamano2-10/+11
Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability
2017-07-21Merge branch 'rj/cygwin-fread-reads-directories'Libravatar Junio C Hamano1-0/+1
It turns out that Cygwin also needs the fopen() wrapper that returns failure when a directory is opened for reading. * rj/cygwin-fread-reads-directories: config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin
2017-07-21Merge branch 'jc/po-pritime-fix'Libravatar Junio C Hamano1-0/+21
We started using "%" PRItime, imitating "%" PRIuMAX and friends, as a way to format the internal timestamp value, but this does not play well with gettext(1) i18n framework, and causes "make pot" that is run by the l10n coordinator to create a broken po/git.pot file. This is a possible workaround for that problem. * jc/po-pritime-fix: Makefile: help gettext tools to cope with our custom PRItime format
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:18:34 +0000