| b06d364 | Junio C Hamano | 09 May 2017, 14:26:02 UTC | Git 2.13 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2017, 14:26:02 UTC |
| 951ea76 | Junio C Hamano | 09 May 2017, 14:25:26 UTC | Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po l10n for Git 2.13.0 round 2.1 * tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.13.0 l10n round 2 l10n: sv.po: Update Swedish translation (3195t0f0u) l10n: zh_CN: review for git v2.13.0 l10n round 1 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3195t) l10n: fr.po v2.13 rnd 2 l10n: de.po: translate 4 new messages l10n: de.po: update German translation l10n: de.po: lower case after semi-colon l10n: vi.po(3195t): Update translation for v2.13.0 round 2 l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed) l10n: zh_CN: for git v2.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed) | 09 May 2017, 14:25:26 UTC |
| 961f9c8 | Jiang Xin | 09 May 2017, 14:12:34 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 (3195t0f0u) | 09 May 2017, 14:12:34 UTC |
| 60638e9 | Jiang Xin | 09 May 2017, 13:55:38 UTC | l10n: zh_CN: for git v2.13.0 l10n round 2 Translate 4 messages (3195t0f0u) for git v2.13.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 09 May 2017, 13:55:38 UTC |
| 6402d7f | Peter Krefting | 09 May 2017, 07:05:09 UTC | l10n: sv.po: Update Swedish translation (3195t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 May 2017, 07:05:09 UTC |
| 09fc7af | Junio C Hamano | 09 May 2017, 03:20:21 UTC | Sync with v2.12.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2017, 03:20:21 UTC |
| 9b66978 | Junio C Hamano | 09 May 2017, 03:17:42 UTC | Merge branch 'jh/verify-index-checksum-only-in-fsck' * jh/verify-index-checksum-only-in-fsck: t1450: avoid use of "sed" on the index, which is a binary file | 09 May 2017, 03:17:42 UTC |
| 65e2041 | Ray Chen | 02 May 2017, 15:42:43 UTC | l10n: zh_CN: review for git v2.13.0 l10n round 1 Signed-off-by: Ray Chen <oldsharp@gmail.com> | 08 May 2017, 23:03:34 UTC |
| 0502887 | Jiang Xin | 08 May 2017, 22:39:31 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3195t): Update translation for v2.13.0 round 2 | 08 May 2017, 22:39:31 UTC |
| 7cbacab | Jordi Mas | 07 May 2017, 08:12:01 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 08 May 2017, 22:27:56 UTC |
| 3e69979 | Alexander Shopov | 07 May 2017, 07:25:19 UTC | l10n: bg.po: Updated Bulgarian translation (3195t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 08 May 2017, 22:24:36 UTC |
| f172ad6 | Jiang Xin | 08 May 2017, 22:18:53 UTC | Merge branch 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git * 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git: l10n: fr.po v2.13 rnd 2 | 08 May 2017, 22:18:53 UTC |
| f5be008 | Jean-Noel Avila | 05 May 2017, 09:55:14 UTC | l10n: fr.po v2.13 rnd 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 06 May 2017, 10:12:54 UTC |
| 0efcb8b | Ralf Thielow | 05 May 2017, 09:23:53 UTC | l10n: de.po: translate 4 new messages Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com> | 05 May 2017, 17:01:24 UTC |
| 5c16226 | Ralf Thielow | 13 April 2017, 14:45:29 UTC | l10n: de.po: update German translation Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com> | 05 May 2017, 17:01:16 UTC |
| c561477 | Michael J Gruber | 17 March 2017, 15:04:19 UTC | l10n: de.po: lower case after semi-colon Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 05 May 2017, 09:16:39 UTC |
| 72dd4a8 | Tran Ngoc Quan | 05 May 2017, 06:41:32 UTC | l10n: vi.po(3195t): Update translation for v2.13.0 round 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 05 May 2017, 06:41:32 UTC |
| 95d6787 | Junio C Hamano | 05 May 2017, 04:33:22 UTC | Git 2.12.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:33:22 UTC |
| ebb1f6f | Junio C Hamano | 05 May 2017, 04:31:40 UTC | Merge branch 'maint-2.11' into maint | 05 May 2017, 04:31:40 UTC |
| 773e3a2 | Junio C Hamano | 05 May 2017, 04:29:43 UTC | Git 2.11.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:29:43 UTC |
| a849d36 | Junio C Hamano | 05 May 2017, 04:26:31 UTC | Merge branch 'maint-2.10' into maint-2.11 | 05 May 2017, 04:26:31 UTC |
| 840ed14 | Junio C Hamano | 05 May 2017, 04:24:10 UTC | Git 2.10.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:24:10 UTC |
| fc92b08 | Junio C Hamano | 05 May 2017, 04:21:52 UTC | Merge branch 'maint-2.9' into maint-2.10 | 05 May 2017, 04:21:52 UTC |
| d61226c | Junio C Hamano | 05 May 2017, 04:18:23 UTC | Git 2.9.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:19:10 UTC |
| c93ab42 | Junio C Hamano | 05 May 2017, 04:13:48 UTC | Merge branch 'maint-2.8' into maint-2.9 | 05 May 2017, 04:13:48 UTC |
| cd08873 | Junio C Hamano | 05 May 2017, 04:08:54 UTC | Git 2.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:08:54 UTC |
| a8d93d1 | Junio C Hamano | 05 May 2017, 04:05:03 UTC | Merge branch 'maint-2.7' into maint-2.8 | 05 May 2017, 04:05:03 UTC |
| c8dd1e3 | Junio C Hamano | 05 May 2017, 04:03:40 UTC | Git 2.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 04:03:40 UTC |
| dc58c85 | Junio C Hamano | 05 May 2017, 03:59:16 UTC | Merge branch 'maint-2.6' into maint-2.7 | 05 May 2017, 03:59:16 UTC |
| 70fcaef | Junio C Hamano | 05 May 2017, 03:56:19 UTC | Git 2.6.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 03:56:19 UTC |
| ab37a18 | Junio C Hamano | 05 May 2017, 03:52:26 UTC | Merge branch 'maint-2.5' into maint-2.6 | 05 May 2017, 03:52:26 UTC |
| ac33201 | Junio C Hamano | 05 May 2017, 03:49:00 UTC | Git 2.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 03:50:38 UTC |
| 531788a | Junio C Hamano | 05 May 2017, 03:46:53 UTC | Merge branch 'maint-2.4' into maint-2.5 | 05 May 2017, 03:46:53 UTC |
| 4000b40 | Junio C Hamano | 05 May 2017, 03:25:09 UTC | Git 2.4.12 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 03:43:16 UTC |
| 5a4ffdf | Junio C Hamano | 05 May 2017, 03:17:55 UTC | Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4 * jk/shell-no-repository-that-begins-with-dash: shell: disallow repo names beginning with dash | 05 May 2017, 03:17:55 UTC |
| 3ec8044 | Jeff King | 29 April 2017, 12:36:44 UTC | shell: disallow repo names beginning with dash When a remote server uses git-shell, the client side will connect to it like: ssh server "git-upload-pack 'foo.git'" and we literally exec ("git-upload-pack", "foo.git"). In early versions of upload-pack and receive-pack, we took a repository argument and nothing else. But over time they learned to accept dashed options. If the user passes a repository name that starts with a dash, the results are confusing at best (we complain of a bogus option instead of a non-existent repository) and malicious at worst (the user can start an interactive pager via "--help"). We could pass "--" to the sub-process to make sure the user's argument is interpreted as a branch name. I.e.: git-upload-pack -- -foo.git But adding "--" automatically would make us inconsistent with a normal shell (i.e., when git-shell is not in use), where "-foo.git" would still be an error. For that case, the client would have to specify the "--", but they can't do so reliably, as existing versions of git-shell do not allow more than a single argument. The simplest thing is to simply disallow "-" at the start of the repo name argument. This hasn't worked either with or without git-shell since version 1.0.0, and nobody has complained. Note that this patch just applies to do_generic_cmd(), which runs upload-pack, receive-pack, and upload-archive. There are two other types of commands that git-shell runs: - do_cvs_cmd(), but this already restricts the argument to be the literal string "server" - admin-provided commands in the git-shell-commands directory. We'll pass along arbitrary arguments there, so these commands could have similar problems. But these commands might actually understand dashed arguments, so we cannot just block them here. It's up to the writer of the commands to make sure they are safe. With great power comes great responsibility. Reported-by: Timo Schmid <tschmid@ernw.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2017, 03:07:27 UTC |
| 28e1aaa | Jiang Xin | 05 May 2017, 01:37:02 UTC | l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed) Generate po/git.pot from v2.13.0-rc2 for git v2.13.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 May 2017, 01:37:02 UTC |
| 694c76f | Jiang Xin | 05 May 2017, 01:35:22 UTC | 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.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed) | 05 May 2017, 01:35:22 UTC |
| 87cb799 | Jiang Xin | 23 April 2017, 01:55:51 UTC | l10n: zh_CN: for git v2.13.0 l10n round 1 Translate 96 messages (3198t0f0u) for git v2.13.0-rc0. Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 May 2017, 01:32:08 UTC |
| 90117bd | Jiang Xin | 05 May 2017, 01:30:33 UTC | Merge branch 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git * 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git: l10n: fr.po v2.13 round 1 | 05 May 2017, 01:30:33 UTC |
| 4fa66c8 | Junio C Hamano | 04 May 2017, 07:27:19 UTC | Git 2.13-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2017, 07:27:19 UTC |
| 7c7478f | Junio C Hamano | 04 May 2017, 07:26:47 UTC | Merge branch 'rg/a-the-typo' Typofix. * rg/a-the-typo: fix minor typos | 04 May 2017, 07:26:47 UTC |
| c8ddd2a | Junio C Hamano | 04 May 2017, 07:26:46 UTC | Merge branch 'sr/hooks-cwd-doc' * sr/hooks-cwd-doc: githooks.txt: clarify push hooks are always executed in $GIT_DIR | 04 May 2017, 07:26:46 UTC |
| 9f3e2fe | Junio C Hamano | 04 May 2017, 07:26:46 UTC | Merge branch 'rg/doc-submittingpatches-wordfix' * rg/doc-submittingpatches-wordfix: doc: update SubmittingPatches | 04 May 2017, 07:26:46 UTC |
| 741eaf7 | Junio C Hamano | 04 May 2017, 07:26:45 UTC | Merge branch 'rg/doc-pull-typofix' * rg/doc-pull-typofix: doc: git-pull.txt use US spelling, fix minor typo | 04 May 2017, 07:26:45 UTC |
| fa675eb | Junio C Hamano | 04 May 2017, 07:26:44 UTC | Merge branch 'ja/i18n-cleanup' * ja/i18n-cleanup: i18n: read-cache: typofix i18n: remove i18n from tag reflog message | 04 May 2017, 07:26:44 UTC |
| 6a523d6 | Jean-Noel Avila | 23 April 2017, 21:29:44 UTC | l10n: fr.po v2.13 round 1 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 02 May 2017, 20:21:09 UTC |
| 9a26691 | Vasco Almeida | 25 April 2017, 14:35:41 UTC | l10n: pt_PT: update Portuguese translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 01 May 2017, 21:20:50 UTC |
| d2bbb7c | Junio C Hamano | 01 May 2017, 05:16:18 UTC | Merging a handful of topics before -rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 05:16:18 UTC |
| 0998b64 | Junio C Hamano | 01 May 2017, 05:14:44 UTC | Merge branch 'sh/rebase-i-reread-todo-after-exec' "git rebase -i" failed to re-read the todo list file when the command specified with the `exec` instruction updated it. * sh/rebase-i-reread-todo-after-exec: rebase -i: reread the todo list if `exec` touched it | 01 May 2017, 05:14:44 UTC |
| 3c0a7b9 | Junio C Hamano | 01 May 2017, 05:14:44 UTC | Merge branch 'ls/travis-stricter-linux32-builds' 32-bit Linux build on Travis CI uses stricter compilation options. * ls/travis-stricter-linux32-builds: travis-ci: set DEVELOPER knob for Linux32 build | 01 May 2017, 05:14:44 UTC |
| 373e4b0 | Junio C Hamano | 01 May 2017, 05:14:44 UTC | Merge branch 'ls/travis-win-fix-status' Relaying status from Windows build by Travis CI was done with an unsafe invocation of printf. * ls/travis-win-fix-status: travis-ci: printf $STATUS as string | 01 May 2017, 05:14:44 UTC |
| d92dbf1 | Junio C Hamano | 01 May 2017, 05:14:43 UTC | Merge branch 'jk/submodule-init-segv-fix' Fix a segv in 'submodule init' when url is not given for a submodule. * jk/submodule-init-segv-fix: submodule_init: die cleanly on submodules without url defined | 01 May 2017, 05:14:44 UTC |
| b0f8987 | Junio C Hamano | 01 May 2017, 05:14:43 UTC | Merge branch 'jk/prio-queue-avoid-swap-with-self' Code clean-up. * jk/prio-queue-avoid-swap-with-self: prio_queue_reverse: don't swap elements with themselves | 01 May 2017, 05:14:43 UTC |
| d9dfed9 | Junio C Hamano | 01 May 2017, 05:14:42 UTC | Merge branch 'ab/align-perf-descriptions' Output from perf tests have been updated to align their titles. * ab/align-perf-descriptions: t/perf: correctly align non-ASCII descriptions in output | 01 May 2017, 05:14:42 UTC |
| b439747 | Junio C Hamano | 01 May 2017, 05:14:41 UTC | Merge branch 'jk/complete-checkout-sans-dwim-remote' Completion for "git checkout <branch>" that auto-creates the branch out of a remote tracking branch can now be disabled, as this completion often gets in the way when completing to checkout an existing local branch that happens to share the same prefix with bunch of remote tracking branches. * jk/complete-checkout-sans-dwim-remote: completion: optionally disable checkout DWIM | 01 May 2017, 05:14:41 UTC |
| 78bde92 | Peter Krefting | 30 April 2017, 21:32:48 UTC | i18n: read-cache: typofix Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 02:08:02 UTC |
| c3027be | Jean-Noel Avila | 30 April 2017, 21:32:47 UTC | i18n: remove i18n from tag reflog message The building of the reflog message is using strbuf, which is not friendly with internationalization frameworks. No other reflog messages are translated right now and switching all the messages to i18n would require a major rework of the way the messages are built. Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 02:08:02 UTC |
| d395745 | René Genz | 30 April 2017, 14:54:25 UTC | doc: git-pull.txt use US spelling, fix minor typo Signed-off-by: René Genz <liebundartig@freenet.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 02:03:08 UTC |
| 5621760 | René Genz | 30 April 2017, 15:48:27 UTC | fix minor typos Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: René Genz <liebundartig@freenet.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 02:01:52 UTC |
| 501d3cd | Simon Ruderich | 29 April 2017, 12:28:29 UTC | githooks.txt: clarify push hooks are always executed in $GIT_DIR Listing the specific hooks might feel verbose but without it the reader is left to wonder which hooks are triggered during the push. Something which is not immediately obvious when only trying to find out where the hook is executed. Signed-off-by: Simon Ruderich <simon@ruderich.org> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 01:56:15 UTC |
| 01e60a9 | René Genz | 30 April 2017, 15:42:21 UTC | doc: update SubmittingPatches -use US English spelling -minor wording change for better readability Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: René Genz <liebundartig@freenet.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2017, 00:08:10 UTC |
| 61d4c30 | Alexander Shopov | 10 March 2017, 08:39:56 UTC | l10n: bg.po: Updated Bulgarian translation (3201t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 30 April 2017, 16:58:32 UTC |
| 7895b2b | Jiang Xin | 29 April 2017, 02:01:41 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 | 29 April 2017, 02:01:41 UTC |
| 54fd324 | Stephen Hicks | 26 April 2017, 19:17:40 UTC | rebase -i: reread the todo list if `exec` touched it In the scripted version of the interactive rebase, there was no internal representation of the todo list; it was re-read before every command. That allowed the hack that an `exec` command could append (or even completely rewrite) the todo list. This hack was broken by the partial conversion of the interactive rebase to C, and this patch reinstates it. We also add a small test to verify that this fix does not regress in the future. Signed-off-by: Stephen Hicks <sdh@google.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2017, 01:56:26 UTC |
| dcc3e7f | Lars Schneider | 26 April 2017, 19:18:57 UTC | travis-ci: set DEVELOPER knob for Linux32 build The Linux32 build was not build with our strict compiler settings (e.g. warnings as errors). Fix this by passing the DEVELOPER environment variable to the docker container. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2017, 01:23:56 UTC |
| c4b4968 | Lars Schneider | 26 April 2017, 19:39:33 UTC | travis-ci: printf $STATUS as string If the $STATUS variable contains a "%" character then printf will interpret that as invalid format string. Fix this by formatting $STATUS as string. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2017, 01:23:19 UTC |
| 4d9bc37 | Jeff Hostetler | 25 April 2017, 18:41:09 UTC | t1450: avoid use of "sed" on the index, which is a binary file The previous step added a path zzzzzzzz to the index, and then used "sed" to replace this string to yyyyyyyy to create a test case where the checksum at the end of the file does not match the contents. Unfortunately, use of "sed" on a non-text file is not portable. Instead, use a Perl script that seeks to the end and modifies the last byte of the file (where we _know_ stores the trailing checksum). Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2017, 00:41:19 UTC |
| 027a3b9 | Junio C Hamano | 26 April 2017, 06:44:07 UTC | Git 2.13-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 April 2017, 06:44:07 UTC |
| 77b34ea | Junio C Hamano | 26 April 2017, 06:39:13 UTC | Merge branch 'mh/separate-ref-cache' The internals of the refs API around the cached refs has been streamlined. * mh/separate-ref-cache: do_for_each_entry_in_dir(): delete function files_pack_refs(): use reference iteration commit_packed_refs(): use reference iteration cache_ref_iterator_begin(): make function smarter get_loose_ref_cache(): new function get_loose_ref_dir(): function renamed from get_loose_refs() do_for_each_entry_in_dir(): eliminate `offset` argument refs: handle "refs/bisect/" in `loose_fill_ref_dir()` ref-cache: use a callback function to fill the cache refs: record the ref_store in ref_cache, not ref_dir ref-cache: introduce a new type, ref_cache refs: split `ref_cache` code into separate files ref-cache: rename `remove_entry()` to `remove_entry_from_dir()` ref-cache: rename `find_ref()` to `find_ref_entry()` ref-cache: rename `add_ref()` to `add_ref_entry()` refs_verify_refname_available(): use function in more places refs_verify_refname_available(): implement once for all backends refs_ref_iterator_begin(): new function refs_read_raw_ref(): new function get_ref_dir(): don't call read_loose_refs() for "refs/bisect" | 26 April 2017, 06:39:13 UTC |
| e311597 | Junio C Hamano | 26 April 2017, 06:39:12 UTC | Merge branch 'nd/worktree-add-lock' Allow to lock a worktree immediately after it's created. This helps prevent a race between "git worktree add; git worktree lock" and "git worktree prune". * nd/worktree-add-lock: worktree add: add --lock option | 26 April 2017, 06:39:12 UTC |
| 7ba7bff | Junio C Hamano | 26 April 2017, 06:39:11 UTC | Merge branch 'jk/update-links-in-docs' Many stale HTTP(s) links have been updated in our documentation. * jk/update-links-in-docs: docs/bisect-lk2009: update java code conventions link docs/bisect-lk2009: update nist report link docs/archimport: quote sourcecontrol.net reference gitcore-tutorial: update broken link doc: replace or.cz gitwiki link with git.wiki.kernel.org doc: use https links to avoid http redirect | 26 April 2017, 06:39:11 UTC |
| d4592d7 | Junio C Hamano | 26 April 2017, 06:39:10 UTC | Merge branch 'sf/putty-w-args' Plug a memleak. * sf/putty-w-args: connect.c: fix leak in handle_ssh_variant | 26 April 2017, 06:39:10 UTC |
| f70b541 | Junio C Hamano | 26 April 2017, 06:39:09 UTC | Merge branch 'ab/completion-push-delete-ref' The completion script (in contrib/) learned to complete "git push --delete b<TAB>" to complete branch name to be deleted. * ab/completion-push-delete-ref: completion: expand "push --delete <remote> <ref>" for refs on that <remote> | 26 April 2017, 06:39:09 UTC |
| 3961c51 | Junio C Hamano | 26 April 2017, 06:39:09 UTC | Merge branch 'cc/split-index-config' The split-index code configuration code used an unsafe git_path() function without copying its result out. * cc/split-index-config: read-cache: avoid using git_path() in freshen_shared_index() | 26 April 2017, 06:39:09 UTC |
| b80f629 | Junio C Hamano | 26 April 2017, 06:39:08 UTC | Merge branch 'jk/war-on-git-path' While handy, "git_path()" is a dangerous function to use as a callsite that uses it safely one day can be broken by changes to other code that calls it. Reduction of its use continues. * jk/war-on-git-path: am: drop "dir" parameter from am_state_init replace strbuf_addstr(git_path()) with git_path_buf() replace xstrdup(git_path(...)) with git_pathdup(...) use git_path_* helper functions branch: add edit_description() helper bisect: add git_path_bisect_terms helper | 26 April 2017, 06:39:08 UTC |
| 6cbc478 | Junio C Hamano | 26 April 2017, 06:39:07 UTC | Merge branch 'jh/add-index-entry-optim' "git checkout" that handles a lot of paths has been optimized by reducing the number of unnecessary checks of paths in the has_dir_name() function. * jh/add-index-entry-optim: read-cache: speed up has_dir_name (part 2) read-cache: speed up has_dir_name (part 1) read-cache: speed up add_index_entry during checkout p0006-read-tree-checkout: perf test to time read-tree read-cache: add strcmp_offset function | 26 April 2017, 06:39:07 UTC |
| 864033a | Junio C Hamano | 26 April 2017, 06:39:07 UTC | Merge branch 'ss/submodule-shallow-doc' Doc update. * ss/submodule-shallow-doc: gitmodules: clarify what history depth a shallow clone has | 26 April 2017, 06:39:07 UTC |
| 3c2312e | Junio C Hamano | 26 April 2017, 06:39:06 UTC | Merge branch 'ss/gitmodules-ignore-doc' Doc update. * ss/gitmodules-ignore-doc: gitmodules: clarify the ignore option values | 26 April 2017, 06:39:06 UTC |
| c9672ba | Junio C Hamano | 26 April 2017, 06:39:05 UTC | Merge branch 'nd/conditional-config-in-early-config' The recently introduced conditional inclusion of configuration did not work well when early-config mechanism was involved. * nd/conditional-config-in-early-config: config: correct file reading order in read_early_config() config: handle conditional include when $GIT_DIR is not set up config: prepare to pass more info in git_config_with_options() | 26 April 2017, 06:39:05 UTC |
| 46bdfa3 | Junio C Hamano | 26 April 2017, 06:39:05 UTC | Merge branch 'ab/push-cas-doc-n-test' Doc update. * ab/push-cas-doc-n-test: push: document & test --force-with-lease with multiple remotes | 26 April 2017, 06:39:05 UTC |
| fa86d5c | Junio C Hamano | 26 April 2017, 06:39:04 UTC | Merge branch 'ls/travis-coccicheck' Travis CI learns to run coccicheck. * ls/travis-coccicheck: travis-ci: add static analysis build job to run coccicheck | 26 April 2017, 06:39:04 UTC |
| 44427a0 | Junio C Hamano | 26 April 2017, 06:39:03 UTC | Merge branch 'ps/pathspec-empty-prefix-origin' A recent update broke "git add -p ../foo" from a subdirectory. * ps/pathspec-empty-prefix-origin: pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix | 26 April 2017, 06:39:03 UTC |
| da4c600 | Junio C Hamano | 26 April 2017, 06:39:02 UTC | Merge branch 'pc/t2027-git-to-pipe-cleanup' Having a git command on the upstream side of a pipe in a test script will hide the exit status from the command, which may cause us to fail to notice a breakage; rewrite tests in a script to avoid this issue. * pc/t2027-git-to-pipe-cleanup: t2027: avoid using pipes | 26 April 2017, 06:39:02 UTC |
| 768c7cb | Junio C Hamano | 26 April 2017, 06:39:01 UTC | Merge branch 'gb/rebase-signoff' "git rebase" learns "--signoff" option. * gb/rebase-signoff: rebase: pass --[no-]signoff option to git am builtin/am: fold am_signoff() into am_append_signoff() builtin/am: honor --signoff also when --rebasing | 26 April 2017, 06:39:02 UTC |
| 64bd31b | Tran Ngoc Quan | 25 April 2017, 08:09:06 UTC | l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 25 April 2017, 08:09:06 UTC |
| 1f9e18b | Jeff King | 24 April 2017, 11:49:20 UTC | prio_queue_reverse: don't swap elements with themselves Our array-reverse algorithm does the usual "walk from both ends, swapping elements". We can quit when the two indices are equal, since: 1. Swapping an element with itself is a noop. 2. If i and j are equal, then in the next iteration i is guaranteed to be bigge than j, and we will exit the loop. So exiting the loop on equality is slightly more efficient. And more importantly, the new SWAP() macro does not expect to handle noop swaps; it will call memcpy() with the same src and dst pointers in this case. It's unclear whether that causes a problem on any platforms by violating the "overlapping memory" constraint of memcpy, but it does cause valgrind to complain. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2017, 04:16:44 UTC |
| 627fde1 | Jeff King | 25 April 2017, 00:57:47 UTC | submodule_init: die cleanly on submodules without url defined When we init a submodule, we try to die when it has no URL defined: url = xstrdup(sub->url); if (!url) die(...); But that's clearly nonsense. xstrdup() will never return NULL, and if sub->url is NULL, we'll segfault. These two bits of code need to be flipped, so we check sub->url before looking at it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2017, 02:00:15 UTC |
| e2cb6ab | Junio C Hamano | 24 April 2017, 05:08:33 UTC | Getting ready for -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2017, 05:34:04 UTC |
| 5938454 | Junio C Hamano | 24 April 2017, 05:07:57 UTC | Merge branch 'dt/xgethostname-nul-termination' gethostname(2) may not NUL terminate the buffer if hostname does not fit; unfortunately there is no easy way to see if our buffer was too small, but at least this will make sure we will not end up using garbage past the end of the buffer. * dt/xgethostname-nul-termination: xgethostname: handle long hostnames use HOST_NAME_MAX to size buffers for gethostname(2) | 24 April 2017, 05:07:57 UTC |
| 2d646e3 | Junio C Hamano | 24 April 2017, 05:07:57 UTC | Merge branch 'jk/ls-files-recurse-submodules-fix' "ls-files --recurse-submodules" did not quite work well in a project with nested submodules. * jk/ls-files-recurse-submodules-fix: ls-files: fix path used when recursing into submodules ls-files: fix recurse-submodules with nested submodules | 24 April 2017, 05:07:57 UTC |
| f9096db | Junio C Hamano | 24 April 2017, 05:07:56 UTC | Merge branch 'rs/misc-cppcheck-fixes' Various small fixes. * rs/misc-cppcheck-fixes: server-info: avoid calling fclose(3) twice in update_info_file() files_for_each_reflog_ent_reverse(): close stream and free strbuf on error am: close stream on error, but not stdin | 24 April 2017, 05:07:56 UTC |
| a507115 | Junio C Hamano | 24 April 2017, 05:07:56 UTC | Merge branch 'jk/snprintf-cleanups' Hotfix for a topic that is already in 'master'. * jk/snprintf-cleanups: replace: plug a memory leak | 24 April 2017, 05:07:56 UTC |
| 2cef68f | Junio C Hamano | 24 April 2017, 05:07:55 UTC | Merge branch 'xy/format-patch-base' Doc cleanup. * xy/format-patch-base: doc: trivial typo in git-format-patch.txt | 24 April 2017, 05:07:55 UTC |
| 5000cd4 | Junio C Hamano | 24 April 2017, 05:07:54 UTC | Merge branch 'sb/checkout-recurse-submodules' Code cleanup. * sb/checkout-recurse-submodules: submodule: remove a superfluous second check for the "new" variable | 24 April 2017, 05:07:54 UTC |
| d2617eb | Junio C Hamano | 24 April 2017, 05:07:53 UTC | Merge branch 'jt/fetch-pack-error-reporting' "git fetch-pack" was not prepared to accept ERR packet that the upload-pack can send with a human-readable error message. It showed the packet contents with ERR prefix, so there was no data loss, but it was redundant to say "ERR" in an error message. * jt/fetch-pack-error-reporting: fetch-pack: show clearer error message upon ERR | 24 April 2017, 05:07:53 UTC |
| b30cf67 | Junio C Hamano | 24 April 2017, 05:07:52 UTC | Merge branch 'km/t1400-modernization' Code cleanup. * km/t1400-modernization: t1400: use consistent style for test_expect_success calls | 24 April 2017, 05:07:52 UTC |
| 9f1384f | Junio C Hamano | 24 April 2017, 05:07:51 UTC | Merge branch 'jk/quarantine-received-objects' Add finishing touches to a recent topic. * jk/quarantine-received-objects: refs: reject ref updates while GIT_QUARANTINE_PATH is set receive-pack: document user-visible quarantine effects receive-pack: drop tmp_objdir_env from run_update_hook | 24 April 2017, 05:07:52 UTC |
| d7f8a37 | Junio C Hamano | 24 April 2017, 05:07:50 UTC | Merge branch 'jk/loose-object-fsck' Code cleanup. * jk/loose-object-fsck: sha1_file: remove an used fd variable | 24 April 2017, 05:07:50 UTC |
| 5bceab4 | Junio C Hamano | 24 April 2017, 05:07:50 UTC | Merge branch 'bw/submodule-with-bs-path' "git submodule" script does not work well with strange pathnames. Protect it from a path with slashes in them, at least. * bw/submodule-with-bs-path: submodule: prevent backslash expantion in submodule names | 24 April 2017, 05:07:50 UTC |
