| 4d7268b | Junio C Hamano | 04 August 2017, 19:41:48 UTC | Git 2.14.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2017, 19:41:54 UTC |
| 230ce07 | Junio C Hamano | 04 August 2017, 19:40:37 UTC | Merge tag 'v2.13.5' into maint | 04 August 2017, 19:40:37 UTC |
| 4384e3c | Junio C Hamano | 04 August 2017, 16:31:12 UTC | Git 2.14 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2017, 16:31:12 UTC |
| 62ebe03 | Junio C Hamano | 04 August 2017, 16:29:15 UTC | Merge branch 'ah/patch-id-doc' Docfix. * ah/patch-id-doc: doc: remove unsupported parameter from patch-id | 04 August 2017, 16:29:15 UTC |
| ddd1133 | Junio C Hamano | 04 August 2017, 16:29:14 UTC | Merge branch 'as/diff-options-grammofix' A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix | 04 August 2017, 16:29:14 UTC |
| 384a8b2 | Junio C Hamano | 02 August 2017, 17:52:33 UTC | Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po 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) | 02 August 2017, 17:52:33 UTC |
| 554e850 | Jiang Xin | 02 August 2017, 00:02:37 UTC | l10n: zh_CN: review for git v2.14.0 l10n Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 02 August 2017, 00:02:37 UTC |
| 7234152 | Junio C Hamano | 01 August 2017, 19:30:00 UTC | Git 2.13.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2017, 19:30:00 UTC |
| e312af1 | Junio C Hamano | 01 August 2017, 19:27:31 UTC | Merge tag 'v2.12.4' into maint | 01 August 2017, 19:27:31 UTC |
| c3eb4e6 | Junio C Hamano | 01 August 2017, 18:46:51 UTC | Sync with v2.13.4 | 01 August 2017, 18:46:59 UTC |
| cf8899d | Junio C Hamano | 01 August 2017, 18:45:17 UTC | Git 2.13.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2017, 18:45:17 UTC |
| 3347e76 | Changwoo Ryu | 01 August 2017, 03:32:00 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 01 August 2017, 03:32:00 UTC |
| a4f1674 | Jiang Xin | 11 June 2017, 03:28:31 UTC | l10n: zh_CN: for git v2.14.0 l10n round 2 Translate new l10n messages for git 2.14.0, and update translations on "stash". Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 01 August 2017, 01:26:19 UTC |
| e2d9c46 | Junio C Hamano | 31 July 2017, 20:52:53 UTC | Sync with maint * maint: Preparation for 2.13.4 continues | 31 July 2017, 20:52:53 UTC |
| c94ef19 | Junio C Hamano | 31 July 2017, 20:52:40 UTC | Preparation for 2.13.4 continues Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2017, 20:52:40 UTC |
| 0baf0b8 | Junio C Hamano | 31 July 2017, 20:51:06 UTC | Merge branch 'ks/doc-fixes' into maint Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability | 31 July 2017, 20:51:06 UTC |
| 42dbdef | Junio C Hamano | 31 July 2017, 20:51:05 UTC | Merge branch 'jk/test-copy-bytes-fix' into maint A test fix. * jk/test-copy-bytes-fix: t: handle EOF in test_copy_bytes() | 31 July 2017, 20:51:06 UTC |
| c6767f4 | Junio C Hamano | 31 July 2017, 20:51:05 UTC | Merge branch 'pw/unquote-path-in-git-pm' into maint 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 | 31 July 2017, 20:51:05 UTC |
| 133578a | Junio C Hamano | 31 July 2017, 20:51:05 UTC | Merge branch 'jk/gc-pre-detach-under-hook' into maint 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 | 31 July 2017, 20:51:05 UTC |
| 309ff91 | Junio C Hamano | 31 July 2017, 20:51:05 UTC | Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint 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 | 31 July 2017, 20:51:05 UTC |
| 4f77f61 | Junio C Hamano | 31 July 2017, 20:51:04 UTC | Merge branch 'rs/progress-overall-throughput-at-the-end' into maint 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 | 31 July 2017, 20:51:04 UTC |
| 49f1e2e | Junio C Hamano | 31 July 2017, 20:51:04 UTC | Merge branch 'tb/push-to-cygwin-unc-path' into maint 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 | 31 July 2017, 20:51:04 UTC |
| bc2c50f | Junio C Hamano | 31 July 2017, 20:51:04 UTC | Merge branch 'rs/apply-avoid-over-reading' into maint 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() | 31 July 2017, 20:51:04 UTC |
| 483709a | Junio C Hamano | 31 July 2017, 20:05:15 UTC | Merge branch 'js/blame-lib' A hotfix to a topic already in 'master'. * js/blame-lib: blame: fix memory corruption scrambling revision name in error message | 31 July 2017, 20:05:15 UTC |
| bc9b7e2 | Anthony Sottile | 31 July 2017, 14:00:31 UTC | diff-options doc: grammar fix Signed-off-by: Anthony Sottile <asottile@umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2017, 16:57:12 UTC |
| 3d9c5b5 | Junio C Hamano | 30 July 2017, 22:06:06 UTC | Git 2.12.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 22:06:06 UTC |
| 3def5e9 | Junio C Hamano | 30 July 2017, 22:04:22 UTC | Merge tag 'v2.11.3' into maint-2.12 Git 2.11.3 | 30 July 2017, 22:04:22 UTC |
| 9315f27 | Junio C Hamano | 30 July 2017, 22:03:21 UTC | Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12 | 30 July 2017, 22:03:21 UTC |
| 3b82744 | Junio C Hamano | 30 July 2017, 22:02:37 UTC | Git 2.11.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 22:02:37 UTC |
| 05bb78a | Junio C Hamano | 30 July 2017, 22:01:31 UTC | Merge tag 'v2.10.4' into maint-2.11 Git 2.10.4 | 30 July 2017, 22:01:31 UTC |
| 0bfff81 | Junio C Hamano | 30 July 2017, 22:00:04 UTC | Git 2.10.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 22:00:04 UTC |
| d78f06a | Junio C Hamano | 30 July 2017, 21:57:33 UTC | Merge tag 'v2.9.5' into maint-2.10 Git 2.9.5 | 30 July 2017, 21:57:33 UTC |
| 4d4165b | Junio C Hamano | 30 July 2017, 21:53:25 UTC | Git 2.9.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 21:53:25 UTC |
| af0178a | Junio C Hamano | 30 July 2017, 21:52:14 UTC | Merge tag 'v2.8.6' into maint-2.9 Git 2.8.6 | 30 July 2017, 21:52:14 UTC |
| 8d7f72f | Junio C Hamano | 30 July 2017, 21:49:08 UTC | Git 2.8.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 21:49:08 UTC |
| 7720c33 | Junio C Hamano | 30 July 2017, 21:46:43 UTC | Merge tag 'v2.7.6' into maint-2.8 Git 2.7.6 | 30 July 2017, 21:46:43 UTC |
| 5e0649d | Junio C Hamano | 30 July 2017, 21:45:13 UTC | Git 2.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2017, 21:45:13 UTC |
| 8d44797 | Hartmut Henkel | 27 July 2017, 17:24:09 UTC | l10n: de.po: various fixes in German translation 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> | 30 July 2017, 15:21:06 UTC |
| 7873fb6 | Jiang Xin | 30 July 2017, 14:47:47 UTC | 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 | 30 July 2017, 14:47:47 UTC |
| a65a75d | Dimitriy Ryazantcev | 30 July 2017, 09:35:40 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 30 July 2017, 09:35:40 UTC |
| a4f234b | Junio C Hamano | 28 July 2017, 23:11:54 UTC | Merge branch 'jk/ssh-funny-url' into maint-2.7 | 28 July 2017, 23:11:54 UTC |
| aeeb2d4 | Jeff King | 28 July 2017, 19:28:55 UTC | connect: reject paths that look like command line options If we get a repo path like "-repo.git", we may try to invoke "git-upload-pack -repo.git". This is going to fail, since upload-pack will interpret it as a set of bogus options. But let's reject this before we even run the sub-program, since we would not want to allow any mischief with repo names that actually are real command-line options. You can still ask for such a path via git-daemon, but there's no security problem there, because git-daemon enters the repo itself and then passes "." on the command line. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:54:55 UTC |
| 3be4cf0 | Jeff King | 28 July 2017, 19:26:50 UTC | connect: reject dashed arguments for proxy commands If you have a GIT_PROXY_COMMAND configured, we will run it with the host/port on the command-line. If a URL contains a mischievous host like "--foo", we don't know how the proxy command may handle it. It's likely to break, but it may also do something dangerous and unwanted (technically it could even do something useful, but that seems unlikely). We should err on the side of caution and reject this before we even run the command. The hostname check matches the one we do in a similar circumstance for ssh. The port check is not present for ssh, but there it's not necessary because the syntax is "-p <port>", and there's no ambiguity on the parsing side. It's not clear whether you can actually get a negative port to the proxy here or not. Doing: git fetch git://remote:-1234/repo.git keeps the "-1234" as part of the hostname, with the default port of 9418. But it's a good idea to keep this check close to the point of running the command to make it clear that there's no way to circumvent it (and at worst it serves as a belt-and-suspenders check). Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:52:18 UTC |
| 2491f77 | Jeff King | 28 July 2017, 19:25:45 UTC | connect: factor out "looks like command line option" check We reject hostnames that start with a dash because they may be confused for command-line options. Let's factor out that notion into a helper function, as we'll use it in more places. And while it's simple now, it's not clear if some systems might need more complex logic to handle all cases. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:51:56 UTC |
| 2d90add | Jeff King | 28 July 2017, 19:23:32 UTC | t5813: add test for hostname starting with dash Per the explanation in the previous patch, this should be (and is) rejected. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:51:29 UTC |
| 820d765 | Junio C Hamano | 26 July 2017, 17:24:20 UTC | connect: reject ssh hostname that begins with a dash When commands like "git fetch" talk with ssh://$rest_of_URL/, the code splits $rest_of_URL into components like host, port, etc., and then spawns the underlying "ssh" program by formulating argv[] array that has: - the path to ssh command taken from GIT_SSH_COMMAND, etc. - dashed options like '-batch' (for Tortoise), '-p <port>' as needed. - ssh_host, which is supposed to be the hostname parsed out of $rest_of_URL. - then the command to be run on the other side, e.g. git upload-pack. If the ssh_host ends up getting '-<anything>', the argv[] that is used to spawn the command becomes something like: { "ssh", "-p", "22", "-<anything>", "command", "to", "run", NULL } which obviously is bogus, but depending on the actual value of "<anything>", will make "ssh" parse and use it as an option. Prevent this by forbidding ssh_host that begins with a "-". Noticed-by: Joern Schneeweisz of Recurity Labs Reported-by: Brian at GitLab Signed-off-by: Junio C Hamano <gitster@pobox.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:51:14 UTC |
| 30c586f | Jeff King | 28 July 2017, 21:47:48 UTC | t/lib-proto-disable: restore protocol.allow after config tests The tests for protocol.allow actually set that variable in the on-disk config, run a series of tests, and then never clean up after themselves. This means that whatever tests we run after have protocol.allow=never, which may influence their results. In most cases we either exit after running these tests, or do another round of test_proto(). In the latter case, this happens to work because: 1. Tests of the GIT_ALLOW_PROTOCOL environment variable override the config. 2. Tests of the specific config "protocol.foo.allow" override the protocol.allow config. 3. The next round of protocol.allow tests start off by setting the config to a known value. However, it's a land-mine waiting to trap somebody adding new tests to one of the t581x test scripts. Let's make sure we clean up after ourselves. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 22:48:39 UTC |
| ac05222 | Andreas Heiduk | 27 July 2017, 22:46:16 UTC | doc: remove unsupported parameter from patch-id The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2017, 21:41:32 UTC |
| 79e8ee8 | Jiang Xin | 27 July 2017, 15:12:11 UTC | Merge branch 'master' of https://github.com/ralfth/git-po-de * 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: update German translation | 27 July 2017, 15:12:11 UTC |
| 437d212 | Jiang Xin | 27 July 2017, 15:10:13 UTC | Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git * '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 | 27 July 2017, 15:10:13 UTC |
| 12142e1 | Jean-Noel Avila | 26 July 2017, 13:48:29 UTC | l10n: fr.po v2.14.0 rnd 2 Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr> | 27 July 2017, 02:29:15 UTC |
| eb7bb1c | Sylvestre Ledru | 22 June 2017, 09:22:47 UTC | l10n: fr.po Fix some french typos Signed-off-by: Sylvestre Ledru <sylvestre@debian.org> | 27 July 2017, 02:28:56 UTC |
| 694f610 | Louis | 06 July 2017, 20:21:14 UTC | l10n: fr.po Fix typo Signed-off-by: Louis <spalax@gresille.org> | 27 July 2017, 02:22:23 UTC |
| 8430988 | Hugues Peccatte | 17 May 2017, 20:26:19 UTC | l10n: fr.po Fix some translations Signed-off-by: Hugues Peccatte <hugues.peccatte@aareon.fr> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 27 July 2017, 02:22:19 UTC |
| 2166cd5 | Ralf Thielow | 21 July 2017, 16:59:08 UTC | l10n: de.po: update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 July 2017, 16:22:27 UTC |
| 7b043d0 | Jiang Xin | 25 July 2017, 16:13:54 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po * 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation | 25 July 2017, 16:13:54 UTC |
| b1bb0df | Jiang Xin | 25 July 2017, 16:13:05 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3213t) | 25 July 2017, 16:13:05 UTC |
| 365fb9d | Tran Ngoc Quan | 25 July 2017, 00:09:13 UTC | l10n: vi.po (3213t): Updated 9 new strings Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 25 July 2017, 00:09:13 UTC |
| 5800c63 | Junio C Hamano | 24 July 2017, 21:50:35 UTC | Git 2.14-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2017, 21:50:35 UTC |
| 9e7d8a9 | SZEDER Gábor | 24 July 2017, 21:15:50 UTC | blame: fix memory corruption scrambling revision name in error message 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> | 24 July 2017, 21:38:02 UTC |
| 9e3958e | Junio C Hamano | 24 July 2017, 21:01:08 UTC | Merge https://github.com/git-l10n/git-po * 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 | 24 July 2017, 21:01:08 UTC |
| 1d99545 | Jordi Mas | 24 July 2017, 16:29:29 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 24 July 2017, 16:29:29 UTC |
| 3db60c9 | Alexander Shopov | 24 July 2017, 15:27:43 UTC | l10n: bg.po: Updated Bulgarian translation (3213t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 24 July 2017, 15:28:43 UTC |
| 91d443d | Jiang Xin | 24 July 2017, 14:00:44 UTC | l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed) 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> | 24 July 2017, 14:00:44 UTC |
| 9212553 | Jiang Xin | 24 July 2017, 13:53:47 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * '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 | 24 July 2017, 13:53:47 UTC |
| 842e0d6 | Jiang Xin | 21 July 2017, 22:19:21 UTC | 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 (3206t0f0u) | 21 July 2017, 22:19:21 UTC |
| 5eada89 | Junio C Hamano | 21 July 2017, 22:13:25 UTC | Sync with maint * maint: fixes from 'master' for 2.13.4 | 21 July 2017, 22:13:25 UTC |
| 2187e11 | Junio C Hamano | 21 July 2017, 22:06:09 UTC | fixes from 'master' for 2.13.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2017, 22:06:09 UTC |
| 3835124 | Junio C Hamano | 21 July 2017, 22:03:40 UTC | Merge branch 'ew/fd-cloexec-fix' into maint Portability/fallback fix. * ew/fd-cloexec-fix: set FD_CLOEXEC properly when O_CLOEXEC is not supported | 21 July 2017, 22:03:40 UTC |
| bae7e3f | Junio C Hamano | 21 July 2017, 22:03:39 UTC | Merge branch 'ks/fix-rebase-doc-picture' into maint Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration | 21 July 2017, 22:03:39 UTC |
| bdea5ba | Junio C Hamano | 21 July 2017, 22:03:38 UTC | Merge branch 'js/alias-case-sensitivity' into maint 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 | 21 July 2017, 22:03:38 UTC |
| ba1c089 | Junio C Hamano | 21 July 2017, 22:03:38 UTC | Merge branch 'bb/unicode-10.0' into maint Update the character width tables. * bb/unicode-10.0: unicode: update the width tables to Unicode 10 | 21 July 2017, 22:03:38 UTC |
| 19533e2 | Junio C Hamano | 21 July 2017, 22:02:51 UTC | Hopefully the final last-minute fix before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2017, 22:02:51 UTC |
| 4326211 | Junio C Hamano | 21 July 2017, 21:57:37 UTC | Merge branch 'ks/doc-fixes' Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability | 21 July 2017, 21:57:37 UTC |
| 3e05c53 | Junio C Hamano | 21 July 2017, 21:57:37 UTC | Merge branch 'rj/cygwin-fread-reads-directories' 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 | 21 July 2017, 21:57:37 UTC |
| a491307 | Junio C Hamano | 21 July 2017, 21:57:36 UTC | Merge branch 'jc/po-pritime-fix' 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 | 21 July 2017, 21:57:37 UTC |
| a5956d6 | Ramsay Jones | 21 July 2017, 18:43:17 UTC | config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2017, 18:58:06 UTC |
| 981adb9 | Junio C Hamano | 20 July 2017, 23:31:56 UTC | A few more topics while waiting for the po/PRItime resolution Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2017, 23:31:56 UTC |
| 4f0b213 | Junio C Hamano | 20 July 2017, 23:30:00 UTC | Merge branch 'mt/p4-parse-G-output' Use "p4 -G" to make "p4 changes" output more Python-friendly to parse. * mt/p4-parse-G-output: git-p4: filter for {'code':'info'} in p4CmdList git-p4: parse marshal output "p4 -G" in p4 changes git-p4: git-p4 tests with p4 triggers | 20 July 2017, 23:30:00 UTC |
| 2842e06 | Junio C Hamano | 20 July 2017, 23:30:00 UTC | Merge branch 'ew/fd-cloexec-fix' Portability/fallback fix. * ew/fd-cloexec-fix: set FD_CLOEXEC properly when O_CLOEXEC is not supported | 20 July 2017, 23:30:00 UTC |
| e4efb39 | Junio C Hamano | 20 July 2017, 23:29:59 UTC | Merge branch 'jk/build-with-asan' A recent update made it easier to use "-fsanitize=" option while compiling but supported only one sanitize option. Allow more than one to be combined, joined with a comma, like "make SANITIZE=foo,bar". * jk/build-with-asan: Makefile: allow combining UBSan with other sanitizers | 20 July 2017, 23:29:59 UTC |
| d5bfa46 | Junio C Hamano | 20 July 2017, 23:29:59 UTC | Merge branch 'jk/test-copy-bytes-fix' A test fix. * jk/test-copy-bytes-fix: t: handle EOF in test_copy_bytes() | 20 July 2017, 23:29:59 UTC |
| 099b74b | Junio C Hamano | 20 July 2017, 23:29:59 UTC | Merge branch 'js/alias-case-sensitivity' 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 | 20 July 2017, 23:29:59 UTC |
| 7b7c15b | Peter Krefting | 20 July 2017, 21:00:16 UTC | l10n: sv.po: Update Swedish translation (3206t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 20 July 2017, 21:00:16 UTC |
| b7ef54f | Ævar Arnfjörð Bjarmason | 20 July 2017, 14:19:24 UTC | RelNotes: mention "sha1dc: optionally use sha1collisiondetection as a submodule" To note that merely cloning git.git without --recurse-submodules doesn't get you a full copy of the code anymore. See 5f6482d642 ("RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp"", 2017-07-20). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2017, 20:34:03 UTC |
| b18a38b | Ævar Arnfjörð Bjarmason | 20 July 2017, 14:19:23 UTC | RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp" To inform users that they can use --regexp-ignore-case now, and that existing scripts which relied on that + PCRE may be buggy. See 9e3cbc59d5 ("log: make --regexp-ignore-case work with --perl-regexp", 2017-05-20). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2017, 20:33:57 UTC |
| 9902d36 | Ævar Arnfjörð Bjarmason | 20 July 2017, 14:19:22 UTC | RelNotes: mention "log: add -P as a synonym for --perl-regexp" To inform users that they can use the short form now. See 7531a2dd87 ("log: add -P as a synonym for --perl-regexp", 2017-05-25). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2017, 20:33:50 UTC |
| fc0fd5b | Junio C Hamano | 20 July 2017, 18:57:01 UTC | Makefile: help gettext tools to cope with our custom PRItime format We started using our own timestamp_t type and PRItime format specifier to go along with it, so that we can later change the underlying type and output format more easily, but this does not play well with gettext tools. Because gettext tools need to keep the *.po file portable across platforms, they have to special-case the format specifiers like PRIuMAX that are known types in inttypes.h, instead of letting CPP handle strings like "%" PRIuMAX " seconds ago" as an ordinary string concatenation. They fundamentally cannot do the same for our own custom type/format. Given that po/git.pot needs to be generated only once every release and by only one person, i.e. the l10n coordinator, let's update the Makefile rule to generate po/git.pot so that gettext tools are run on a munged set of sources in which all mentions of PRItime are replaced with PRIuMAX, which is what we happen to use right now. This way, developers do not have to care that PRItime does not play well with gettext, and translators do not have to care that we use our own PRItime. The credit for the idea to munge the source files goes to Dscho. Possible bugs are mine. Helped-by: Jiang Xin <worldhello.net@gmail.com> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2017, 19:21:18 UTC |
| e3fe4f7 | Changwoo Ryu | 19 July 2017, 08:15:28 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 19 July 2017, 08:15:54 UTC |
| 3a33fe5 | Kaartic Sivaraam | 18 July 2017, 14:34:27 UTC | doc: reformat the paragraph containing the 'cut-line' The paragraph that describes the 'scissors' cleanup mode of 'commit' had the 'cut-line' in the middle of a sentence. This made it possible for the line to get wrapped on smaler windows. This shouldn't be the case as it makes it hard for the user to understand the structure of the cut-line. Reformat the pragraph to make the 'cut-line' stand on a line of it's own thus distinguishing it from the rest of the paragraph. This further prevents it from getting wrapped to some extent. Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2017, 22:04:49 UTC |
| cac25fc | Junio C Hamano | 18 July 2017, 19:52:49 UTC | A few more topics before 2.14-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2017, 19:52:49 UTC |
| 764046f | Junio C Hamano | 18 July 2017, 19:48:10 UTC | Merge branch 'jk/gc-pre-detach-under-hook' 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 | 18 July 2017, 19:48:10 UTC |
| 1115749 | Junio C Hamano | 18 July 2017, 19:48:10 UTC | Merge branch 'jn/hooks-pre-rebase-sample-fix' 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 | 18 July 2017, 19:48:10 UTC |
| a11ab57 | Junio C Hamano | 18 July 2017, 19:48:09 UTC | Merge branch 'rs/progress-overall-throughput-at-the-end' 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 | 18 July 2017, 19:48:09 UTC |
| 33400c0 | Junio C Hamano | 18 July 2017, 19:48:09 UTC | Merge branch 'tb/push-to-cygwin-unc-path' 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 | 18 July 2017, 19:48:09 UTC |
| 298082b | Jordi Mas | 18 July 2017, 19:06:06 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 18 July 2017, 19:06:06 UTC |
| 95791be | Kaartic Sivaraam | 17 July 2017, 15:39:00 UTC | doc: camelCase the i18n config variables to improve readability The i18n config variable used weren't readable as they were in the crude form of how git stores/uses it's config variables. Improve it's readability by replacing them with camelCased versions of config variables as it doesn't have any impact on it's usage. Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 July 2017, 22:11:26 UTC |
| f7f6dc3 | Jeff King | 16 July 2017, 10:45:32 UTC | t: handle EOF in test_copy_bytes() The test_copy_bytes() function claims to read up to N bytes, or until it gets EOF. But we never handle EOF in our loop, and a short input will cause perl to go into an infinite loop of read() getting zero bytes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 July 2017, 21:55:43 UTC |
| 9fb9495 | Eric Wong | 15 July 2017, 18:55:40 UTC | set FD_CLOEXEC properly when O_CLOEXEC is not supported FD_CLOEXEC only applies to the file descriptor, so it needs to be manipuluated via F_GETFD/F_SETFD. F_GETFL/F_SETFL are for file description flags. Verified via strace with o_cloexec set to zero. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 July 2017, 21:52:16 UTC |
| 425ca67 | René Scharfe | 15 July 2017, 17:18:56 UTC | Makefile: allow combining UBSan with other sanitizers Multiple sanitizers can be specified as a comma-separated list. Set the flag NO_UNALIGNED_LOADS even if UndefinedBehaviorSanitizer is not the only sanitizer to build with. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 July 2017, 21:50:27 UTC |
