| 5fa0f52 | Junio C Hamano | 16 August 2019, 17:28:23 UTC | Git 2.23 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2019, 17:28:23 UTC |
| 8e0fa0e | Junio C Hamano | 16 August 2019, 17:22:51 UTC | Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.23.0-rnd2 | 16 August 2019, 17:22:51 UTC |
| a6cd2cc | Jiang Xin | 30 July 2019, 02:02:22 UTC | l10n: zh_CN: for git v2.23.0 l10n round 1~2 Translate 128 new messages (4674t0f0u) for git 2.23.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 16 August 2019, 08:59:17 UTC |
| 1f5ab2d | Matthias Ruester | 02 August 2019, 09:42:08 UTC | l10n: de.po: Update German translation Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> | 12 August 2019, 16:48:08 UTC |
| 5900439 | Jiang Xin | 12 August 2019, 08:04:28 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi(4674t): Updated translation for Vietnamese | 12 August 2019, 08:04:28 UTC |
| ba82e37 | Jiang Xin | 12 August 2019, 08:02:08 UTC | Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po * 'update-italian-translation' of github.com:AlessandroMenti/git-po: l10n: it.po: update the Italian localization for v2.23.0 round 2 | 12 August 2019, 08:02:08 UTC |
| 6c1a7dd | Jiang Xin | 12 August 2019, 08:00:14 UTC | Merge branch 'next' of https://github.com/ChrisADR/git-po * 'next' of https://github.com/ChrisADR/git-po: l10n: es: 2.23.0 round 2 | 12 August 2019, 08:00:14 UTC |
| ff66981 | Junio C Hamano | 12 August 2019, 00:41:39 UTC | Sync with Git 2.22.1 | 12 August 2019, 00:41:39 UTC |
| 24966cd | Mark Rushakoff | 10 August 2019, 05:59:14 UTC | doc: fix repeated words Inspired by 21416f0a07 ("restore: fix typo in docs", 2019-08-03), I ran "git grep -E '(\b[a-zA-Z]+) \1\b' -- Documentation/" to find other cases where words were duplicated, e.g. "the the", and in most cases removed one of the repeated words. There were many false positives by this grep command, including deliberate repeated words like "really really" or valid uses of "that that" which I left alone, of course. I also did not correct any of the legitimate, accidentally repeated words in old RelNotes. Signed-off-by: Mark Rushakoff <mark.rushakoff@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2019, 00:40:07 UTC |
| 75b2f01 | Junio C Hamano | 09 August 2019, 22:20:04 UTC | Git 2.22.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2019, 22:07:51 UTC |
| 3d246de | Philip Oakley | 11 August 2019, 15:03:38 UTC | .mailmap: update email address of Philip Oakley My IEE 'home for life' email service is being withdrawn on 30 Sept 2019. Replace with my new email domain. I also have a secondary (backup) 'home for life' through <philipoakley@dunelm.org.uk>. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2019, 22:07:51 UTC |
| ad1d0a5 | Alessandro Menti | 11 August 2019, 09:54:27 UTC | l10n: it.po: update the Italian localization for v2.23.0 round 2 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 11 August 2019, 09:54:27 UTC |
| 8a4adfd | Tran Ngoc Quan | 11 August 2019, 00:14:07 UTC | l10n: vi(4674t): Updated translation for Vietnamese Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 11 August 2019, 00:14:07 UTC |
| 3f3e3f9 | Christopher Diaz Riveros | 15 July 2019, 21:50:36 UTC | l10n: es: 2.23.0 round 2 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 10 August 2019, 18:17:33 UTC |
| ec688f7 | Jean-Noël Avila | 10 August 2019, 16:12:51 UTC | l10n: fr v2.23.0 round 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 10 August 2019, 16:17:31 UTC |
| 466c88f | Jiang Xin | 10 August 2019, 12:13:14 UTC | l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed) Generate po/git.pot from v2.23.0-rc2 for git v2.23.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 10 August 2019, 12:13:14 UTC |
| d6d5cbf | Jiang Xin | 10 August 2019, 12:11:17 UTC | Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git Git 2.23-rc2 * tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git: (63 commits) Git 2.23-rc2 t0000: reword comments for "local" test t: decrease nesting in test_oid_to_path sha1-file: release strbuf after use test-dir-iterator: use path argument directly dir-iterator: release strbuf after use commit-graph: release strbufs after use l10n: reformat some localized strings for v2.23.0 merge-recursive: avoid directory rename detection in recursive case commit-graph: fix bug around octopus merges restore: fix typo in docs doc: typo: s/can not/cannot/ and s/is does/does/ Git 2.23-rc1 log: really flip the --mailmap default RelNotes/2.23.0: fix a few typos and other minor issues RelNotes/2.21.1: typofix log: flip the --mailmap default unconditionally config: work around bug with includeif:onbranch and early config A few more last-minute fixes repack: simplify handling of auto-bitmaps and .keep files ... | 10 August 2019, 12:11:17 UTC |
| 5532a55 | Alexander Shopov | 09 August 2019, 05:08:03 UTC | l10n: bg.po: Updated Bulgarian translation (4674t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 10 August 2019, 09:34:54 UTC |
| 5d929ec | Junio C Hamano | 09 August 2019, 22:18:19 UTC | Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint Compilation fix. * cb/xdiff-no-system-includes-in-dot-c: xdiff: remove duplicate headers from xpatience.c xdiff: remove duplicate headers from xhistogram.c xdiff: drop system includes in xutils.c | 09 August 2019, 22:18:19 UTC |
| 414784d | Junio C Hamano | 09 August 2019, 22:18:18 UTC | Merge branch 'jk/no-system-includes-in-dot-c' into maint Compilation fix. * jk/no-system-includes-in-dot-c: wt-status.h: drop stdio.h include verify-tag: drop signal.h include | 09 August 2019, 22:18:19 UTC |
| 5e864ac | Junio C Hamano | 09 August 2019, 22:18:18 UTC | Merge branch 'sg/fsck-config-in-doc' into maint Doc update. * sg/fsck-config-in-doc: Documentation/git-fsck.txt: include fsck.* config variables | 09 August 2019, 22:18:18 UTC |
| ae76814 | Junio C Hamano | 09 August 2019, 22:18:18 UTC | Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint The internal diff machinery can be made to read out of bounds while looking for --funcion-context line in a corner case, which has been corrected. * jk/xdiff-clamp-funcname-context-index: xdiff: clamp function context indices in post-image | 09 August 2019, 22:18:18 UTC |
| 2e27de9 | Junio C Hamano | 09 August 2019, 17:15:39 UTC | Git 2.23-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2019, 17:15:39 UTC |
| fcdd9cc | Junio C Hamano | 09 August 2019, 17:13:14 UTC | Merge branch 'bc/hash-independent-tests-part-4' Test fix. * bc/hash-independent-tests-part-4: t0000: reword comments for "local" test t: decrease nesting in test_oid_to_path | 09 August 2019, 17:13:14 UTC |
| d2422a9 | Junio C Hamano | 09 August 2019, 17:13:14 UTC | Merge branch 'rs/plug-strbuf-reak-in-read-alt-refs' Leakfix. * rs/plug-strbuf-reak-in-read-alt-refs: sha1-file: release strbuf after use | 09 August 2019, 17:13:14 UTC |
| 9179380 | Junio C Hamano | 09 August 2019, 17:13:14 UTC | Merge branch 'mt/dir-iterator-updates' Leakfix. * mt/dir-iterator-updates: test-dir-iterator: use path argument directly dir-iterator: release strbuf after use | 09 August 2019, 17:13:14 UTC |
| 203cf46 | Junio C Hamano | 09 August 2019, 17:13:13 UTC | Merge branch 'ds/commit-graph-incremental' Leakfix. * ds/commit-graph-incremental: commit-graph: release strbufs after use | 09 August 2019, 17:13:13 UTC |
| c2a8c37 | Junio C Hamano | 08 August 2019, 21:26:10 UTC | Merge branch 'ja/l10n-fixes' A few messages have been updated to help localization better. * ja/l10n-fixes: l10n: reformat some localized strings for v2.23.0 | 08 August 2019, 21:26:10 UTC |
| 0bdaec1 | Junio C Hamano | 08 August 2019, 21:26:10 UTC | Merge branch 'en/disable-dir-rename-in-recursive-merge' "merge-recursive" hit a BUG() when building a virtual merge base detected a directory rename. * en/disable-dir-rename-in-recursive-merge: merge-recursive: avoid directory rename detection in recursive case | 08 August 2019, 21:26:10 UTC |
| c0a6c66 | Junio C Hamano | 08 August 2019, 21:26:09 UTC | Merge branch 'nd/switch-and-restore' Docfix. * nd/switch-and-restore: restore: fix typo in docs | 08 August 2019, 21:26:09 UTC |
| 68c1ac4 | Junio C Hamano | 08 August 2019, 21:26:09 UTC | Merge branch 'mr/doc-can-not-to-cannot' Docfix. * mr/doc-can-not-to-cannot: doc: typo: s/can not/cannot/ and s/is does/does/ | 08 August 2019, 21:26:09 UTC |
| 3bcedae | Junio C Hamano | 08 August 2019, 21:26:09 UTC | Merge branch 'ds/commit-graph-octopus-fix' commit-graph did not handle commits with more than two parents correctly, which has been corrected. * ds/commit-graph-octopus-fix: commit-graph: fix bug around octopus merges | 08 August 2019, 21:26:09 UTC |
| 7f0b590 | Jeff King | 08 August 2019, 09:37:33 UTC | t0000: reword comments for "local" test Commit 01d3a526ad (t0000: check whether the shell supports the "local" keyword, 2017-10-26) added a test to gather data on whether people run the test suite with shells that don't support "local". After almost two years, nobody has complained, and several other uses have cropped up in test-lib-functions.sh. Let's declare it acceptable to use. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2019, 17:22:55 UTC |
| 1c1f6e0 | Jonathan Nieder | 08 August 2019, 06:56:14 UTC | t: decrease nesting in test_oid_to_path t1410.3 ("corrupt and checks") fails when run using dash versions before 0.5.8, with a cryptic message: mv: cannot stat '.git/objects//e84adb2704cbd49549e52169b4043871e13432': No such file or directory The function generating that path: test_oid_to_path () { echo "${1%${1#??}}/${1#??}" } which is supposed to produce a result like 12/3456789.... But a dash bug[*] causes it to instead expand to /3456789... The stream of symbols that makes up this function is hard for humans to follow, too. The complexity mostly comes from the repeated use of the expression ${1#??} for the basename of the loose object. Use a variable instead --- nowadays, the dialect of shell used by Git permits local variables, so this is cheap. An alternative way to work around [*] is to remove the double-quotes around test_oid_to_path's return value. That makes the expression easier for dash to read, but harder for humans. Let's prefer the rephrasing that's helpful for humans, too. Noticed by building on Ubuntu trusty, which uses dash 0.5.7. [*] Fixed by v0.5.8~13 ("[EXPAND] Propagate EXP_QPAT in subevalvar, 2013-08-23). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2019, 17:22:52 UTC |
| 86ad3ea | René Scharfe | 07 August 2019, 11:15:25 UTC | sha1-file: release strbuf after use Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2019, 19:28:57 UTC |
| 7df3bd4 | René Scharfe | 07 August 2019, 11:15:20 UTC | test-dir-iterator: use path argument directly Avoid allocating and leaking a strbuf for holding a verbatim copy of the path argument and pass the latter directly to dir_iterator_begin() instead. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2019, 19:26:35 UTC |
| 9b7b029 | René Scharfe | 07 August 2019, 11:15:14 UTC | dir-iterator: release strbuf after use Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2019, 19:25:35 UTC |
| 0aa6bce | René Scharfe | 07 August 2019, 11:15:02 UTC | commit-graph: release strbufs after use Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2019, 19:24:01 UTC |
| 182f59d | Jean-Noël Avila | 06 August 2019, 17:19:52 UTC | l10n: reformat some localized strings for v2.23.0 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2019, 19:43:43 UTC |
| ff6d547 | Elijah Newren | 05 August 2019, 22:33:50 UTC | merge-recursive: avoid directory rename detection in recursive case Ever since commit 8c8e5bd6eb33 ("merge-recursive: switch directory rename detection default", 2019-04-05), the default handling with directory rename detection was to report a conflict and leave unstaged entries in the index. However, when creating a virtual merge base in the recursive case, we absolutely need a tree, and the only way a tree can be written is if we have no unstaged entries -- otherwise we hit a BUG(). There are a few fixes possible here which at least fix the BUG(), but none of them seem optimal for other reasons; see the comments with the new testcase 13e in t6043 for details (which testcase triggered a BUG() prior to this patch). As such, just opt for a very conservative and simple choice that is still relatively reasonable: have the recursive case treat 'conflict' as 'false' for opt->detect_directory_renames. Reported-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2019, 17:42:36 UTC |
| 50106db | Tran Ngoc Quan | 06 August 2019, 07:30:57 UTC | l10n: vi.po (4676t): Updated Vietnamese translation Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 06 August 2019, 07:30:57 UTC |
| a35bea4 | Derrick Stolee | 05 August 2019, 16:43:41 UTC | commit-graph: fix bug around octopus merges In 1771be90 "commit-graph: merge commit-graph chains" (2019-06-18), the method sort_and_scan_merged_commits() was added to merge the commit lists of two commit-graph files in the incremental format. Unfortunately, there was an off-by-one error in that method around incrementing num_extra_edges, which leads to an incorrect offset for the base graph chunk. When we store an octopus merge in the commit-graph file, we store the first parent in the normal place, but use the second parent position to point into the "extra edges" chunk where the remaining parents exist. This means we should be adding "num_parents - 1" edges to this list, not "num_parents - 2". That is the basic error. The reason this was not caught in the test suite is more subtle. In 5324-split-commit-graph.sh, we test creating an octopus merge and adding it to the tip of a commit-graph chain, then verify the result. This _should_ have caught the problem, except that when we load the commit-graph files we were overly careful to not fail when the commit-graph chain does not match. This care was on purpose to avoid race conditions as one process reads the chain and another process modifies it. In such a case, the reading process outputs the following message to stderr: warning: commit-graph chain does not match These warnings are output in the test suite, but ignored. By checking the stderr of `git commit-graph verify` to include the expected progress output, it will now catch this error. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2019, 21:59:50 UTC |
| 21416f0 | William Chargin | 03 August 2019, 22:04:58 UTC | restore: fix typo in docs Signed-off-by: William Chargin <wchargin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2019, 19:39:39 UTC |
| 6d16922 | Mark Rushakoff | 03 August 2019, 05:33:51 UTC | doc: typo: s/can not/cannot/ and s/is does/does/ "Can not" suggests one has the option to not do something, whereas "cannot" more strongly suggests something is disallowed or impossible. Noticed "can not", mistakenly used instead of "cannot" in git help glossary, then ran git grep 'can not' and found many other instances. Only files in the Documentation folder were modified. 'Can not' also occurs in some source code comments and some test assertion messages, and there is an error message and translation "can not move directory into itself" which I may fix and submit separately from the documentation change. Also noticed and fixed "is does" in git help fetch, but there are no other occurrences of that typo according to git grep. Signed-off-by: Mark Rushakoff <mark.rushakoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2019, 17:05:24 UTC |
| 78a9b45 | Jiang Xin | 03 August 2019, 13:09:13 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po * 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation | 03 August 2019, 13:09:13 UTC |
| 22cc9a3 | Jiang Xin | 03 August 2019, 13:07:05 UTC | Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po * 'update-italian-translation' of github.com:AlessandroMenti/git-po: l10n: it.po: update the Italian translation for v2.23.0 | 03 August 2019, 13:07:05 UTC |
| 6a7e7c4 | Jordi Mas | 03 August 2019, 07:27:05 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 03 August 2019, 07:27:05 UTC |
| 7c20df8 | Junio C Hamano | 02 August 2019, 20:12:24 UTC | Git 2.23-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2019, 20:12:24 UTC |
| 14fe4af | Junio C Hamano | 02 August 2019, 20:12:03 UTC | Merge branch 'sg/fsck-config-in-doc' Doc update. * sg/fsck-config-in-doc: Documentation/git-fsck.txt: include fsck.* config variables | 02 August 2019, 20:12:03 UTC |
| c62bc49 | Junio C Hamano | 02 August 2019, 20:12:02 UTC | Merge branch 'js/visual-studio' Support building Git with Visual Studio The bits about .git/branches/* have been dropped from the series. We may want to drop the support for it, but until that happens, the tests should rely on the existence of the support to pass. * js/visual-studio: (23 commits) git: avoid calling aliased builtins via their dashed form bin-wrappers: append `.exe` to target paths if necessary .gitignore: ignore Visual Studio's temporary/generated files .gitignore: touch up the entries regarding Visual Studio vcxproj: also link-or-copy builtins msvc: add a Makefile target to pre-generate the Visual Studio solution contrib/buildsystems: add a backend for modern Visual Studio versions contrib/buildsystems: handle options starting with a slash contrib/buildsystems: also handle -lexpat contrib/buildsystems: handle libiconv, too contrib/buildsystems: handle the curl library option contrib/buildsystems: error out on unknown option contrib/buildsystems: optionally capture the dry-run in a file contrib/buildsystems: redirect errors of the dry run into a log file contrib/buildsystems: ignore gettext stuff contrib/buildsystems: handle quoted spaces in filenames contrib/buildsystems: fix misleading error message contrib/buildsystems: ignore irrelevant files in Generators/ contrib/buildsystems: ignore invalidcontinue.obj Vcproj.pm: urlencode '<' and '>' when generating VC projects ... | 02 August 2019, 20:12:02 UTC |
| 9b274e2 | Junio C Hamano | 02 August 2019, 20:12:02 UTC | Merge branch 'jc/log-mailmap-flip-defaults' Hotfix for making "git log" use the mailmap by default. * jc/log-mailmap-flip-defaults: log: really flip the --mailmap default log: flip the --mailmap default unconditionally | 02 August 2019, 20:12:02 UTC |
| e46249f | Junio C Hamano | 02 August 2019, 20:12:02 UTC | Merge branch 'js/early-config-with-onbranch' The recently added [includeif "onbranch:branch"] feature does not work well with an early config mechanism, as it attempts to find out what branch we are on before we even haven't located the git repository. The inclusion during early config scan is ignored to work around this issue. * js/early-config-with-onbranch: config: work around bug with includeif:onbranch and early config | 02 August 2019, 20:12:02 UTC |
| f3eda90 | Junio C Hamano | 01 August 2019, 21:48:34 UTC | log: really flip the --mailmap default Update the docs, test the interaction between the new default, configuration and command line option, in addition to actually flipping the default. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2019, 16:55:03 UTC |
| 51cf315 | Junio C Hamano | 01 August 2019, 16:10:50 UTC | Merge branch 'jk/repack-silence-auto-bitmap-warning' Squelch unneeded and misleading warnings from "repack" when the command attempts to generate pack bitmaps without explicitly asked for by the user. * jk/repack-silence-auto-bitmap-warning: repack: simplify handling of auto-bitmaps and .keep files repack: silence warnings when auto-enabled bitmaps cannot be built t7700: clean up .keep file in bitmap-writing test | 01 August 2019, 16:10:50 UTC |
| 49541db | Junio C Hamano | 01 August 2019, 16:10:50 UTC | Merge branch 'jk/sort-iter-test-output' * jk/sort-iter-test-output: t: sort output of hashmap iteration | 01 August 2019, 16:10:50 UTC |
| cc2a740 | Junio C Hamano | 01 August 2019, 16:10:49 UTC | Merge branch 'jc/dir-iterator-test-fix' * jc/dir-iterator-test-fix: test-dir-iterator: do not assume errno values | 01 August 2019, 16:10:50 UTC |
| a7b27d9 | Junio C Hamano | 01 August 2019, 16:10:49 UTC | Merge branch 'bc/hash-independent-tests-part-4' Update to the tests to help SHA-256 transition continues. * bc/hash-independent-tests-part-4: t2203: avoid hard-coded object ID values t1710: make hash independent t1007: remove SHA1 prerequisites t0090: make test pass with SHA-256 t0027: make hash size independent t6030: make test work with SHA-256 t5000: make hash independent t1450: make hash size independent t1410: make hash size independent t: add helper to convert object IDs to paths | 01 August 2019, 16:10:49 UTC |
| a45f531 | Martin Ågren | 01 August 2019, 14:12:20 UTC | RelNotes/2.23.0: fix a few typos and other minor issues Fix the spelling of the new "--no-show-forced-updates" option that "git fetch/pull" learned. Similarly, spell "--function-context" correctly and fix a few typos, grammos and minor mistakes. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2019, 16:01:35 UTC |
| a9a63af | Junio C Hamano | 01 August 2019, 16:00:46 UTC | Sync with maint * maint: RelNotes/2.21.1: typofix | 01 August 2019, 16:00:46 UTC |
| 4d8ec15 | Martin Ågren | 01 August 2019, 14:12:20 UTC | RelNotes/2.21.1: typofix Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2019, 16:00:13 UTC |
| 7ed20f5 | Junio C Hamano | 01 August 2019, 15:32:44 UTC | log: flip the --mailmap default unconditionally It turns out that being cautious to warn against upcoming default change was an unpopular behaviour, and such a care can easily be defeated by distro packagers to render it ineffective anyway. Just flip the default, with only a mention in the release notes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2019, 15:46:31 UTC |
| f46393c | Alessandro Menti | 01 August 2019, 07:32:52 UTC | l10n: it.po: update the Italian translation for v2.23.0 Update the Italian translation for Git v2.23.0 (l10n round 1), as well as adding some minor localization fixes. Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 01 August 2019, 07:39:42 UTC |
| 85fe0e8 | Johannes Schindelin | 31 July 2019, 20:06:42 UTC | config: work around bug with includeif:onbranch and early config Since 07b2c0eacac (config: learn the "onbranch:" includeIf condition, 2019-06-05), there is a potential catch-22 in the early config path: if the `include.onbranch:` feature is used, Git assumes that the Git directory has been initialized already. However, in the early config code path that is not true. One way to trigger this is to call the following commands in any repository: git config includeif.onbranch:refs/heads/master.path broken git help -a The symptom triggered by the `git help -a` invocation reads like this: BUG: refs.c:1851: attempting to get main_ref_store outside of repository Let's work around this, simply by ignoring the `includeif.onbranch:` setting when parsing the config when the ref store has not been initialized (yet). Technically, there is a way to solve this properly: teach the refs machinery to initialize the ref_store from a given gitdir/commondir pair (which we _do_ have in the early config code path), and then use that in `include_by_branch()`. This, however, is a pretty involved project, and we're already in the feature freeze for Git v2.23.0. Note: when calling above-mentioned two commands _outside_ of any Git worktree (passing the `--global` flag to `git config`, as there is obviously no repository config available), at the point when `include_by_branch()` is called, `the_repository` is `NULL`, therefore we have to be extra careful not to dereference it in that case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 22:20:56 UTC |
| f36d08d | Junio C Hamano | 31 July 2019, 21:45:42 UTC | A few more last-minute fixes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 21:45:42 UTC |
| d163b6a | Junio C Hamano | 31 July 2019, 21:38:56 UTC | Merge branch 'cb/xdiff-no-system-includes-in-dot-c' Compilation fix. * cb/xdiff-no-system-includes-in-dot-c: xdiff: remove duplicate headers from xpatience.c xdiff: remove duplicate headers from xhistogram.c xdiff: drop system includes in xutils.c | 31 July 2019, 21:38:56 UTC |
| 0bdce88 | Junio C Hamano | 31 July 2019, 21:38:56 UTC | Merge branch 'jk/no-system-includes-in-dot-c' Compilation fix. * jk/no-system-includes-in-dot-c: wt-status.h: drop stdio.h include verify-tag: drop signal.h include | 31 July 2019, 21:38:56 UTC |
| 7ff024e | Jeff King | 31 July 2019, 05:40:56 UTC | repack: simplify handling of auto-bitmaps and .keep files Commit 7328482253 (repack: disable bitmaps-by-default if .keep files exist, 2019-06-29) taught repack to prefer disabling bitmaps to duplicating objects (unless bitmaps were asked for explicitly). But there's an easier way to do this: if we keep passing the --honor-pack-keep flag to pack-objects when auto-enabling bitmaps, then pack-objects already makes the same decision (it will disable bitmaps rather than duplicate). Better still, pack-objects can actually decide to do so based not just on the presence of a .keep file, but on whether that .keep file actually impacts the new pack we're making (so if we're racing with a push or fetch, for example, their temporary .keep file will not block us from generating bitmaps if they haven't yet updated their refs). And because repack uses the --write-bitmap-index-quiet flag, we don't have to worry about pack-objects generating confusing warnings when it does see a .keep file. We can confirm this by tweaking the .keep test to check repack's stderr. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 20:26:25 UTC |
| 2557501 | Jeff King | 31 July 2019, 05:39:27 UTC | repack: silence warnings when auto-enabled bitmaps cannot be built Depending on various config options, a full repack may not be able to build a reachability bitmap index (e.g., if pack.packSizeLimit forces us to write multiple packs). In these cases pack-objects may write a warning to stderr. Since 36eba0323d (repack: enable bitmaps by default on bare repos, 2019-03-14), we may generate these warnings even when the user did not explicitly ask for bitmaps. This has two downsides: - it can be confusing, if they don't know what bitmaps are - a daemonized auto-gc will write this to its log file, and the presence of the warning may suppress further auto-gc (until gc.logExpiry has elapsed) Let's have repack communicate to pack-objects that the choice to turn on bitmaps was not made explicitly by the user, which in turn allows pack-objects to suppress these warnings. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 20:15:51 UTC |
| cc2649a | Jeff King | 31 July 2019, 05:37:36 UTC | t7700: clean up .keep file in bitmap-writing test After our test snippet finishes, the .keep file is left in place, making it hard to do further tests of the auto-bitmap-writing code (since it suppresses the feature completely). Let's clean it up. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 20:14:04 UTC |
| e1e7a77 | Jeff King | 31 July 2019, 01:23:37 UTC | t: sort output of hashmap iteration The iteration order of a hashmap is undefined, and may depend on things like the exact set of items added, or the table has been grown or shrunk. In the case of an oidmap, it even depends on endianness, because we take the oid hash by casting sha1 bytes directly into an unsigned int. Let's sort the test-tool output from any hash iterators. In the case of t0011, this is just future-proofing. But for t0016, it actually fixes a reported failure on the big-endian s390 and nonstop ports. I didn't bother to teach the helper functions to optionally sort output. They are short enough that it's simpler to just repeat them inline for the iteration tests than it is to add a --sort option. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2019, 17:00:34 UTC |
| 2613f06 | Peter Krefting | 31 July 2019, 10:44:47 UTC | l10n: sv.po: Update Swedish translation (4676t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 31 July 2019, 10:46:31 UTC |
| 9042140 | Junio C Hamano | 30 July 2019, 17:45:48 UTC | test-dir-iterator: do not assume errno values A few tests printed 'errno' as an integer and compared with hardcoded integers; this is obviously not portable. A two things to note are: - the string obtained by strerror() is not portable, and cannot be used for the purpose of these tests. - there unfortunately isn't a portable way to map error numbers to error names. As we only care about a few selected errors, just map the error number to the name before emitting for comparison. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2019, 17:45:48 UTC |
| 6b0f1a9 | Jiang Xin | 30 July 2019, 01:59:56 UTC | l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed) Generate po/git.pot from v2.23.0-rc0 for git v2.23.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 30 July 2019, 01:59:56 UTC |
| eccd872 | Jiang Xin | 30 July 2019, 01:56:16 UTC | Merge tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git Git 2.23-rc0 * tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git: (420 commits) Git 2.23-rc0 Merge fixes made on the 'master' front Flush fixes up to the third batch post 2.22.0 The seventh batch git: mark cmd_rebase as requiring a worktree rebase: fix white-space xdiff: clamp function context indices in post-image grep: print the pcre2_jit_on value t6200: use test_commit_bulk travis-ci: build with GCC 4.8 as well The sixth batch clean: show an error message when the path is too long CodingGuidelines: spell out post-C89 rules README: fix rendering of text in angle brackets rm: resolving by removal is not a warning-worthy event transport-helper: avoid var decl in for () loop control stash: fix handling removed files with --keep-index mingw: support spawning programs containing spaces in their names gpg-interface: do not scan past the end of buffer tests: defang pager tests by explicitly disabling the log.mailmap warning ... | 30 July 2019, 01:56:16 UTC |
| b914084 | Johannes Schindelin | 29 July 2019, 20:08:16 UTC | git: avoid calling aliased builtins via their dashed form This is one of the few places where Git violates its own deprecation of the dashed form. It is not necessary, either. As of 595d59e2b53 (git.c: ignore pager.* when launching builtin as dashed external, 2017-08-02), Git wants to ignore the pager.* config setting when expanding aliases. So let's strip out the check_pager_config(<command-name>) call from the copy-edited code. This code actually made it into upstream git.git already, but it was disabled in `#if 0 ... #endif` guards so far. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 3a94cb3 | Johannes Schindelin | 29 July 2019, 20:08:16 UTC | bin-wrappers: append `.exe` to target paths if necessary When compiling with Visual Studio, the projects' names are identical to the executables modulo the extensions. Read: there will exist both a directory called `git` as well as an executable called `git.exe` in the end. Which means that the bin-wrappers *need* to target the `.exe` files lest they try to execute directories. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 2ceed19 | Johannes Schindelin | 29 July 2019, 20:08:15 UTC | .gitignore: ignore Visual Studio's temporary/generated files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 516dfb8 | Philip Oakley | 29 July 2019, 20:08:14 UTC | .gitignore: touch up the entries regarding Visual Studio Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multiple projects (one per target). Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| b18ae14 | Johannes Schindelin | 29 July 2019, 20:08:13 UTC | vcxproj: also link-or-copy builtins The default location for `.exe` files linked by Visual Studio depends on the mode (debug vs release) and the architecture. Meaning: after a full build, there is a `git.exe` in the top-level directory, but none of the built-ins are linked.. When running a test script in Git Bash, it therefore would pick up the wrong, say, `git-receive-pack.exe`: the one installed at the same time as the Git Bash. Absolutely not what we want. We want to have confidence that our test covers the MSVC-built Git executables, and not some random stuff. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 976aaed | Johannes Schindelin | 29 July 2019, 20:08:12 UTC | msvc: add a Makefile target to pre-generate the Visual Studio solution The entire idea of generating the VS solution makes only sense if we generate it via Continuous Integration; otherwise potential users would still have to download the entire Git for Windows SDK. If we pre-generate the Visual Studio solution, Git can be built entirely within Visual Studio, and the test scripts can be run in a regular Git for Windows (e.g. the Portable Git flavor, which does not include a full GCC toolchain and therefore weighs only about a tenth of Git for Windows' SDK). So let's just add a target in the Makefile that can be used to generate said solution; The generated files will then be committed so that they can be pushed to a branch ready to check out by Visual Studio users. To make things even more useful, we also generate and commit other files that are required to run the test suite, such as templates and bin-wrappers: with this, developers can run the test suite in a regular Git Bash after building the solution in Visual Studio. Note: for this build target, we do not actually need to initialize the `vcpkg` system, so we don't. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 384a61b | Johannes Schindelin | 29 July 2019, 20:08:12 UTC | contrib/buildsystems: add a backend for modern Visual Studio versions Based on the previous patches in this patch series that fixed the generator for `.vcproj` files (which were used by Visual Studio prior to 2015 to define projects), this patch offers to generate project definitions for neweer versions of Visual Studio (which use `.vcxproj` files). To that end, this patch copy-edits the generator of the `.vcproj`. In addition, we now use the `vcpkg` system which allows us to build Git's dependencies (e.g. curl, libexpat) conveniently. The support scripts were introduced in the `jh/msvc` patch series, and with this patch we initialize the `vcpkg` conditionally, in the `libgit` project's `PreBuildEvent`. To allow for parallel building of the projects, we therefore put `libgit` at the bottom of the project hierarchy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 4553f9d | Johannes Schindelin | 29 July 2019, 20:08:11 UTC | contrib/buildsystems: handle options starting with a slash With the recent changes to allow building with MSVC=1, we now pass the /OPT:REF option to the compiler. This confuses the parser that wants to turn the output of a dry run into project definitions for QMake and Visual Studio: Unhandled link option @ line 213: /OPT:REF at [...] Let's just extend the code that passes through options that start with a dash, so that it passes through options that start with a slash, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 6e50021 | Johannes Schindelin | 29 July 2019, 20:08:10 UTC | contrib/buildsystems: also handle -lexpat This is a dependency required for the non-smart HTTP backend. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 1a537ec | Johannes Schindelin | 29 July 2019, 20:08:10 UTC | contrib/buildsystems: handle libiconv, too Git's test suite shows tons of breakages unless Git is compiled *without* NO_ICONV. That means, in turn, that we need to generate build definitions *with* libiconv, which in turn implies that we have to handle the -liconv option properly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:43 UTC |
| 9103a75 | Philip Oakley | 29 July 2019, 20:08:09 UTC | contrib/buildsystems: handle the curl library option Upon seeing the '-lcurl' option, point to the libcurl.lib. While there, fix the elsif indentation. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 6669746 | Johannes Schindelin | 29 July 2019, 20:08:08 UTC | contrib/buildsystems: error out on unknown option One time too many did this developer call the `generate` script passing a `--make-out=<PATH>` option that was happily ignored (because there should be a space, not an equal sign, between `--make-out` and the path). And one time too many, this script not only ignored it but did not even complain. Let's fix that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| a530a59 | Philip Oakley | 29 July 2019, 20:08:07 UTC | contrib/buildsystems: optionally capture the dry-run in a file Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out <path>` in subsequent runs via the `--in <path>` option. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 03aa711 | Philip Oakley | 29 July 2019, 20:08:07 UTC | contrib/buildsystems: redirect errors of the dry run into a log file Rather than swallowing the errors, it is better to have them in a file. To make it obvious what this is about, use the file name 'msvc-build-makedryerrors.txt'. Further, if the output is empty, simply delete that file. As we target Git for Windows' SDK (which, unlike its predecessor msysGit, offers Perl versions newer than 5.8), we can use the quite readable syntax `if -f -z $ErrsFile` (available in Perl >=5.10). Note that the file will contain the new values of the GIT_VERSION and GITGUI_VERSION if they were generated by the make file. They are omitted if the release is tagged and indentically defined in their respective GIT_VERSION_GEN file DEF_VER variables. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| aae1713 | Philip Oakley | 29 July 2019, 20:08:06 UTC | contrib/buildsystems: ignore gettext stuff Git's build contains steps to handle internationalization. This caused hiccups in the parser used to generate QMake/Visual Studio project files. As those steps are irrelevant in this context, let's just ignore them. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| d8c0701 | Philip Oakley | 29 July 2019, 20:08:05 UTC | contrib/buildsystems: handle quoted spaces in filenames The engine.pl script expects file names not to contain spaces. However, paths with spaces are quite prevalent on Windows. Use shellwords() rather than split() to parse them correctly. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 90d5170 | Philip Oakley | 29 July 2019, 20:08:05 UTC | contrib/buildsystems: fix misleading error message The error message talked about a "lib option", but it clearly referred to a link option. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| e88919b | Johannes Schindelin | 29 July 2019, 20:08:04 UTC | contrib/buildsystems: ignore irrelevant files in Generators/ The Generators/ directory can contain spurious files such as editors' backup files. Even worse, there could be .swp files which are not even valid Perl scripts. Let's just ignore anything but .pm files in said directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 865406b | Philip Oakley | 29 July 2019, 20:08:03 UTC | contrib/buildsystems: ignore invalidcontinue.obj Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also only substitute filenames ending with .o when generating the source .c filename, otherwise we would start to expect .cbj files to generate .obj files (which are not generated by our build)... In the future there may be source files that produce .obj files so keep the two issues (.obj files with & without source files) separate. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Duncan Smart <duncan.smart@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 158471d | Johannes Schindelin | 29 July 2019, 20:08:03 UTC | Vcproj.pm: urlencode '<' and '>' when generating VC projects Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 905fa99 | Johannes Schindelin | 29 July 2019, 20:08:02 UTC | Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool It is not necessary, and Visual Studio 2015 no longer supports it, anyway. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 92e2f6e | Philip Oakley | 29 July 2019, 20:08:01 UTC | Vcproj.pm: list git.exe first to be startup project Visual Studio takes the first listed application/library as the default startup project [1]. Detect the 'git' project and place it at the head of the project list, rather than at the tail. Export the apps list before libs list for both the projects and global structures of the .sln file. [1] http://stackoverflow.com/questions/1238553/ vs2008-where-is-the-startup-project-setting-stored-for-a-solution "In the solution file, there are a list of pseudo-XML "Project" entries. It turns out that whatever is the first one ends up as the Startup Project, unless it’s overridden in the suo file. Argh. I just rearranged the order in the file and it’s good." "just moving the pseudo-xml isn't enough. You also have to move the group of entries in the "GlobalSection(ProjectConfigurationPlatforms) = postSolution" group that has the GUID of the project you moved to the top. So there are two places to move lines." Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| b704b82 | Johannes Schindelin | 29 July 2019, 20:08:01 UTC | Vcproj.pm: auto-generate GUIDs We ran out GUIDs. Again. But there is no need to: we can generate them semi-randomly from the target file name of the project. Note: the Vcproj generator is probably only interesting for historical reasons; nevertheless, the upcoming Vcxproj generator (to support modern Visual Studio versions) is based on the Vcproj generator and it is better to fix this here first. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 21:51:42 UTC |
| 026dd73 | Junio C Hamano | 29 July 2019, 19:51:24 UTC | Git 2.23-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2019, 19:51:24 UTC |
| 8b79343 | Junio C Hamano | 29 July 2019, 19:40:42 UTC | Sync with maint * maint: Merge fixes made on the 'master' front | 29 July 2019, 19:40:42 UTC |
| 38dac33 | Junio C Hamano | 29 July 2019, 19:39:13 UTC | Merge branch 'js/rebase-cleanup' A few leftover cleanup to "git rebase" in C. * js/rebase-cleanup: git: mark cmd_rebase as requiring a worktree rebase: fix white-space | 29 July 2019, 19:39:14 UTC |
