Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
da72936 Junio C Hamano 04 November 2019, 04:32:41 UTC Git 2.24 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 November 2019, 04:33:06 UTC
1d34d42 Junio C Hamano 04 November 2019, 04:33:06 UTC Merge branch 'bc/doc-use-docbook-5' Finishing touches to the recent update to the build procedure for the documentation. * bc/doc-use-docbook-5: manpage-bold-literal.xsl: match for namespaced "d:literal" in template 04 November 2019, 04:33:06 UTC
dac1d83 Junio C Hamano 04 November 2019, 04:33:06 UTC Merge branch 'ds/commit-graph-on-fetch' Regression fix. * ds/commit-graph-on-fetch: commit-graph: fix writing first commit-graph during fetch t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 04 November 2019, 04:33:06 UTC
c32ca69 Junio C Hamano 04 November 2019, 04:33:05 UTC Merge branch 'jt/delay-fetch-if-missing' Work-around a lazy fetch glitch. * jt/delay-fetch-if-missing: fetch: delay fetch_if_missing=0 until after config 04 November 2019, 04:33:05 UTC
ab6b50e Junio C Hamano 04 November 2019, 04:29:38 UTC Merge https://github.com/prati0100/git-gui * https://github.com/prati0100/git-gui: git-gui: improve Japanese translation git-gui: add a readme git-gui: support for diff3 conflict style git-gui: use existing interface to query a path's attribute git-gui (Windows): use git-bash.exe if it is available treewide: correct several "up-to-date" to "up to date" Fix build with core.autocrlf=true 04 November 2019, 04:29:38 UTC
93bf742 Junio C Hamano 04 November 2019, 04:25:13 UTC Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po l10n-2.24.0-rnd2 * tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.24.0 l10n round 1~2 l10n: de.po: Update German translation l10n: sv.po: Update Swedish translation (4695t0f0u) l10n: bg.po: Updated Bulgarian translation (4694) l10n: vi(4694t): Updated translation for v2.24.0 l10n: es: 2.24.0 round 2 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 l10n: fr v2.24.0 rnd2 l10n: git.pot: v2.24.0 round 2 (1 new) l10n: it.po: update the Italian translation for Git 2.24.0 l10n: fr 2.24.0 rnd 1 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) l10n: bg.po: Updated Bulgarian translation (4693) l10n: sv.po: Update Swedish translation (4674t0f0u) l10n: Update Catalan translation 04 November 2019, 04:25:13 UTC
a5cd71c Jiang Xin 29 October 2019, 02:50:30 UTC l10n: zh_CN: for git v2.24.0 l10n round 1~2 Translate 36 new messages (4694t0f0u) for git 2.24.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 02 November 2019, 12:51:12 UTC
efd5444 Elijah Newren 30 October 2019, 20:21:18 UTC RelNotes/2.24.0: fix self-contradictory note As per Wikipedia, "In current technical usage, for one to state that a feature is deprecated is merely a recommendation against using it." It is thus contradictory to claim that something is not "officially deprecated" and then to immediately state that we are both discouraging its use and pointing people elsewhere. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2019, 06:03:01 UTC
55aca51 Martin Ågren 31 October 2019, 06:22:27 UTC manpage-bold-literal.xsl: match for namespaced "d:literal" in template We recently regressed our rendering with Asciidoctor of "literal" elements in our manpages, i.e, stuff we have placed within `backticks` in order to render as monospace. In particular, we lost the bold rendering of such literal text. The culprit is f6461b82b9 ("Documentation: fix build with Asciidoctor 2", 2019-09-15), where we switched from DocBook 4.5 to DocBook 5 with Asciidoctor. As part of the switch, we started using the namespaced DocBook XSLT stylesheets rather than the non-namespaced ones. (See f6461b82b9 for more details on why we changed to the namespaced ones.) The bold literals are implemented as an XSLT snippet <xsl:template match="literal">...</xsl:template>. Now that we use namespaces, this doesn't pick up our literals like it used to. Match for "d:literal" in addition to just "literal", after defining the d namespace. ("d" is what http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl uses.) Note that we need to keep matching without the namespace for AsciiDoc. This boldness was introduced by 5121a6d993 ("Documentation: option to render literal text as bold for manpages", 2009-03-27) and made the default in 5945717009 ("Documentation: bold literals in man", 2016-05-31). One reason this was not caught in review is that our doc-diff tool diffs without any boldness, i.e., it "only" compares text. As pointed out by Peff in review of this patch, one can use `MAN_KEEP_FORMATTING=1 ./doc-diff <...>` This has been optically tested with AsciiDoc 8.6.10, Asciidoctor 1.5.5 and Asciidoctor 2.0.10. I've also verified that doc-diff produces the empty output for all three programs, as expected, and that with the MAN_KEEP_FORMATTING trick, AsciiDoc yields no diff, whereas with Asciidoctor, we get bold literals, just like we want. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2019, 05:46:42 UTC
849e436 Elijah Newren 30 October 2019, 20:21:17 UTC RelNotes/2.24.0: typofix Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2019, 05:43:51 UTC
798d66e Matthias Rüster 23 October 2019, 17:13:19 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> 31 October 2019, 08:35:59 UTC
c1d0038 Peter Krefting 30 October 2019, 22:22:13 UTC l10n: sv.po: Update Swedish translation (4695t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 30 October 2019, 22:22:13 UTC
f21f8f5 Junio C Hamano 30 October 2019, 06:12:53 UTC Git 2.24-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 October 2019, 06:13:14 UTC
8dc28ee Junio C Hamano 30 October 2019, 06:13:13 UTC Merge branch 'wb/fsmonitor-bitmap-fix' Comment update. * wb/fsmonitor-bitmap-fix: t7519-status-fsmonitor: improve comments 30 October 2019, 06:13:14 UTC
0d6799e Junio C Hamano 30 October 2019, 06:13:13 UTC Merge branch 'rl/gitweb-blame-prev-fix' Fix a rather old bug in gitweb---incremental blame output in javascript actions mode never worked. * rl/gitweb-blame-prev-fix: gitweb: correctly store previous rev in javascript-actions mode 30 October 2019, 06:13:13 UTC
f2db52c Junio C Hamano 30 October 2019, 06:13:13 UTC Merge branch 'js/mingw-needs-hiding-fix' Fix for a (rather old) buffer-overrun bug. * js/mingw-needs-hiding-fix: mingw: avoid a buffer overrun in `needs_hiding()` 30 October 2019, 06:13:13 UTC
5b7594a Jiang Xin 30 October 2019, 06:07:58 UTC Merge branch 'master' of github.com:vnwildman/git * 'master' of github.com:vnwildman/git: l10n: vi(4694t): Updated translation for v2.24.0 30 October 2019, 06:07:58 UTC
034d336 Jiang Xin 30 October 2019, 06:02:22 UTC Merge branch 'next' of github.com:ChrisADR/git-po * 'next' of github.com:ChrisADR/git-po: l10n: es: 2.24.0 round 2 30 October 2019, 06:02:22 UTC
460782b William Baker 16 October 2019, 19:35:47 UTC t7519-status-fsmonitor: improve comments The comments for the staging/unstaging test did not accurately describe the scenario being tested. It is not essential that the test files being staged/unstaged appear at the end of the index. All that is required is that the test files are not flagged with CE_FSMONITOR_VALID and have a position in the index greater than the number of entries in the index after unstaging. The comment for this test has been updated to be more accurate with respect to the scenario that's being tested. Signed-off-by: William Baker <William.Baker@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 October 2019, 02:52:18 UTC
1294a85 Alexander Shopov 29 October 2019, 10:37:45 UTC l10n: bg.po: Updated Bulgarian translation (4694) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 29 October 2019, 10:37:45 UTC
f126a1f Tran Ngoc Quan 29 October 2019, 07:38:42 UTC l10n: vi(4694t): Updated translation for v2.24.0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 29 October 2019, 07:38:42 UTC
77200e9 Christopher Diaz Riveros 15 September 2019, 21:56:56 UTC l10n: es: 2.24.0 round 2 Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> 29 October 2019, 00:21:27 UTC
e42df36 Jiang Xin 28 October 2019, 23:27:51 UTC Merge branch 'l10n/it/update-italian-translation' * 'update-italian-translation' of github.com:AlessandroMenti/git-po: l10n: it.po: update the Italian translation for Git 2.24.0 round #2 28 October 2019, 23:27:51 UTC
5e196e8 Alessandro Menti 28 October 2019, 19:44:05 UTC l10n: it.po: update the Italian translation for Git 2.24.0 round #2 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> 28 October 2019, 19:44:05 UTC
5172848 Jean-Noël Avila 28 October 2019, 19:36:01 UTC l10n: fr v2.24.0 rnd2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 28 October 2019, 19:36:01 UTC
045a548 Jiang Xin 28 October 2019, 05:16:31 UTC l10n: git.pot: v2.24.0 round 2 (1 new) Generate po/git.pot from v2.24.0-rc1 for git v2.24.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 28 October 2019, 05:20:37 UTC
468d356 Jiang Xin 28 October 2019, 05:18:55 UTC Merge tag 'v2.24.0-rc1' of github.com:git/git into master Git 2.24-rc1 * tag 'v2.24.0-rc1' of github.com:git/git: Git 2.24-rc1 repo-settings: read an int for index.version ci: fix GCC install in the Travis CI GCC OSX job Eleventh batch ci(osx): use new location of the `perforce` cask t7419: change test_must_fail to ! for grep t4014: make output-directory tests self-contained ci(visual-studio): actually run the tests in parallel ci(visual-studio): use strict compile flags, and optimization userdiff: fix some corner cases in dts regex test-progress: fix test failures on big-endian systems completion: clarify installation instruction for zsh grep: avoid leak of chartables in PCRE2 grep: make PCRE2 aware of custom allocator grep: make PCRE1 aware of custom allocator remote-curl: pass on atomic capability to remote side diff-highlight: fix a whitespace nit fsmonitor: don't fill bitmap with entries to be removed 28 October 2019, 05:18:55 UTC
60e6569 Johannes Schindelin 25 October 2019, 14:13:36 UTC mingw: avoid a buffer overrun in `needs_hiding()` When this function is passed a path with a trailing slash, it runs right over the end of that path. Let's fix this. Co-authored-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 October 2019, 03:38:51 UTC
52bd3e4 Robert Luberda 27 October 2019, 09:14:26 UTC gitweb: correctly store previous rev in javascript-actions mode Without this change, the setting $feature{'javascript-actions'}{'default'} = [1]; in gitweb.conf breaks gitweb's blame page: clicking on line numbers displayed in the second column on the page has no effect. For comparison, with javascript-actions disabled, clicking on line numbers loads the previous version of the line. Addresses https://bugs.debian.org/741883. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Robert Luberda <robert@debian.org> Acked-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 October 2019, 02:06:57 UTC
cb99a34 Derrick Stolee 24 October 2019, 13:40:42 UTC commit-graph: fix writing first commit-graph during fetch The previous commit includes a failing test for an issue around fetch.writeCommitGraph and fetching in a repo with a submodule. Here, we fix that bug and set the test to "test_expect_success". The problem arises with this set of commands when the remote repo at <url> has a submodule. Note that --recurse-submodules is not needed to demonstrate the bug. $ git clone <url> test $ cd test $ git -c fetch.writeCommitGraph=true fetch origin Computing commit graph generation numbers: 100% (12/12), done. BUG: commit-graph.c:886: missing parent <hash1> for commit <hash2> Aborted (core dumped) As an initial fix, I converted the code in builtin/fetch.c that calls write_commit_graph_reachable() to instead launch a "git commit-graph write --reachable --split" process. That code worked, but is not how we want the feature to work long-term. That test did demonstrate that the issue must be something to do with internal state of the 'git fetch' process. The write_commit_graph() method in commit-graph.c ensures the commits we plan to write are "closed under reachability" using close_reachable(). This method walks from the input commits, and uses the UNINTERESTING flag to mark which commits have already been visited. This allows the walk to take O(N) time, where N is the number of commits, instead of O(P) time, where P is the number of paths. (The number of paths can be exponential in the number of commits.) However, the UNINTERESTING flag is used in lots of places in the codebase. This flag usually means some barrier to stop a commit walk, such as in revision-walking to compare histories. It is not often cleared after the walk completes because the starting points of those walks do not have the UNINTERESTING flag, and clear_commit_marks() would stop immediately. This is happening during a 'git fetch' call with a remote. The fetch negotiation is comparing the remote refs with the local refs and marking some commits as UNINTERESTING. I tested running clear_commit_marks_many() to clear the UNINTERESTING flag inside close_reachable(), but the tips did not have the flag, so that did nothing. It turns out that the calculate_changed_submodule_paths() method is at fault. Thanks, Peff, for pointing out this detail! More specifically, for each submodule, the collect_changed_submodules() runs a revision walk to essentially do file-history on the list of submodules. That revision walk marks commits UNININTERESTING if they are simplified away by not changing the submodule. Instead, I finally arrived on the conclusion that I should use a flag that is not used in any other part of the code. In commit-reach.c, a number of flags were defined for commit walk algorithms. The REACHABLE flag seemed like it made the most sense, and it seems it was not actually used in the file. The REACHABLE flag was used in early versions of commit-reach.c, but was removed by 4fbcca4 (commit-reach: make can_all_from_reach... linear, 2018-07-20). Add the REACHABLE flag to commit-graph.c and use it instead of UNINTERESTING in close_reachable(). This fixes the bug in manual testing. Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Jeff King <peff@peff.net> Helped-by: Szeder Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 October 2019, 02:19:16 UTC
e88aab9 Derrick Stolee 24 October 2019, 13:40:41 UTC t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug While dogfooding, Johannes found a bug in the fetch.writeCommitGraph config behavior. His example initially happened during a clone with --recurse-submodules, we found that this happens with the first fetch after cloning a repository that contains a submodule: $ git clone <url> test $ cd test $ git -c fetch.writeCommitGraph=true fetch origin Computing commit graph generation numbers: 100% (12/12), done. BUG: commit-graph.c:886: missing parent <hash1> for commit <hash2> Aborted (core dumped) In the repo I had cloned, there were really 60 commits to scan, but only 12 were in the list to write when calling compute_generation_numbers(). A commit in the list expects to see a parent, but that parent is not in the list. A follow-up will fix the bug, but first we create a test that demonstrates the problem. This test must be careful about an existing commit-graph file, since GIT_TEST_COMMIT_GRAPH=1 will cause the repo we are cloning to already have one. This then prevents the incremtnal commit-graph write during the first 'git fetch'. Helped-by: Jeff King <peff@peff.net> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Szeder Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 October 2019, 02:19:14 UTC
566a143 Junio C Hamano 24 October 2019, 04:33:49 UTC Git 2.24-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 October 2019, 04:34:03 UTC
04b1f4f Junio C Hamano 24 October 2019, 04:34:03 UTC Merge branch 'sg/ci-osx-gcc8-fix' CI build fix. * sg/ci-osx-gcc8-fix: ci: fix GCC install in the Travis CI GCC OSX job 24 October 2019, 04:34:03 UTC
4d6fb2b Junio C Hamano 24 October 2019, 04:34:02 UTC Merge branch 'ds/feature-macros' The codepath that reads the index.version configuration was broken with a recent update, which has been corrected. * ds/feature-macros: repo-settings: read an int for index.version 24 October 2019, 04:34:03 UTC
5f0b6ed Junio C Hamano 24 October 2019, 04:34:02 UTC Merge branch 'js/azure-ci-osx-fix' Update installation procedure for Perforce on MacOS in the CI jobs running on Azure pipelines, which was failing. * js/azure-ci-osx-fix: ci(osx): use new location of the `perforce` cask 24 October 2019, 04:34:02 UTC
c555caa Junio C Hamano 24 October 2019, 04:34:02 UTC Merge branch 'bw/format-patch-o-create-leading-dirs' Test update. * bw/format-patch-o-create-leading-dirs: t4014: make output-directory tests self-contained 24 October 2019, 04:34:02 UTC
1b4f852 Junio C Hamano 24 October 2019, 04:34:02 UTC Merge branch 'dl/submodule-set-branch' Test update. * dl/submodule-set-branch: t7419: change test_must_fail to ! for grep 24 October 2019, 04:34:02 UTC
c7aadcc Jonathan Tan 23 October 2019, 23:34:03 UTC fetch: delay fetch_if_missing=0 until after config Suppose, from a repository that has ".gitmodules", we clone with --filter=blob:none: git clone --filter=blob:none --no-checkout \ https://kernel.googlesource.com/pub/scm/git/git Then we fetch: git -C git fetch This will cause a "unable to load config blob object", because the fetch_config_from_gitmodules() invocation in cmd_fetch() will attempt to load ".gitmodules" (which Git knows to exist because the client has the tree of HEAD) while fetch_if_missing is set to 0. fetch_if_missing is set to 0 too early - ".gitmodules" here should be lazily fetched. Git must set fetch_if_missing to 0 before the fetch because as part of the fetch, packfile negotiation happens (and we do not want to fetch any missing objects when checking existence of objects), but we do not need to set it so early. Move the setting of fetch_if_missing to the earliest possible point in cmd_fetch(), right before any fetching happens. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 October 2019, 02:34:44 UTC
c11e996 Derrick Stolee 23 October 2019, 20:38:57 UTC repo-settings: read an int for index.version Several config options were combined into a repo_settings struct in ds/feature-macros, including a move of the "index.version" config setting in 7211b9e (repo-settings: consolidate some config settings, 2019-08-13). Unfortunately, that file looked like a lot of boilerplate and what is clearly a factor of copy-paste overload, the config setting is parsed with repo_config_ge_bool() instead of repo_config_get_int(). This means that a setting "index.version=4" would not register correctly and would revert to the default version of 3. I caught this while incorporating v2.24.0-rc0 into the VFS for Git codebase, where we really care that the index is in version 4. This was not caught by the codebase because the version checks placed in t1600-index.sh did not test the "basic" scenario enough. Here, we modify the test to include these normal settings to not be overridden by features.manyFiles or GIT_INDEX_VERSION. While the "default" version is 3, this is demoted to version 2 in do_write_index() when not necessary. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 October 2019, 02:33:45 UTC
7d4733c SZEDER Gábor 24 October 2019, 00:20:40 UTC ci: fix GCC install in the Travis CI GCC OSX job A few days ago Travis CI updated their existing OSX images, including the Homebrew database in the xcode10.1 OSX image that we use. Since then installing dependencies in the 'osx-gcc' job fails when it tries to link gcc@8: + brew link gcc@8 Error: No such keg: /usr/local/Cellar/gcc@8 GCC8 is still installed but not linked to '/usr/local' in the updated image, as it was before this update, but now we have to link it by running 'brew link gcc'. So let's do that then, and fall back to linking gcc@8 if it doesn't, just to be sure. Our builds on Azure Pipelines are unaffected by this issue. The OSX image over there doesn't contain the gcc@8 package, so we have to 'brew install' it, which already takes care of linking it to '/usr/local'. After that the 'brew link gcc' command added by this patch fails, but the ||-chained fallback 'brew link gcc@8' command succeeds with an "already linked" warning. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 October 2019, 02:31:07 UTC
d81542e Junio C Hamano 23 October 2019, 05:42:27 UTC Eleventh batch The tenth was at -rc0 ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 05:43:11 UTC
e0ff2d4 Junio C Hamano 23 October 2019, 05:43:11 UTC Merge branch 'cb/pcre2-chartables-leakfix' Leakfix. * cb/pcre2-chartables-leakfix: grep: avoid leak of chartables in PCRE2 grep: make PCRE2 aware of custom allocator grep: make PCRE1 aware of custom allocator 23 October 2019, 05:43:11 UTC
d45d771 Junio C Hamano 23 October 2019, 05:43:11 UTC Merge branch 'bc/smart-http-atomic-push' The atomic push over smart HTTP transport did not work, which has been corrected. * bc/smart-http-atomic-push: remote-curl: pass on atomic capability to remote side 23 October 2019, 05:43:11 UTC
22dd22d Junio C Hamano 23 October 2019, 05:43:10 UTC Merge branch 'wb/fsmonitor-bitmap-fix' A segfault fix. * wb/fsmonitor-bitmap-fix: fsmonitor: don't fill bitmap with entries to be removed 23 October 2019, 05:43:10 UTC
2e215b7 Junio C Hamano 23 October 2019, 05:43:10 UTC Merge branch 'sb/userdiff-dts' Tweak userdiff patterns for dts. * sb/userdiff-dts: userdiff: fix some corner cases in dts regex 23 October 2019, 05:43:10 UTC
e3cf083 Junio C Hamano 23 October 2019, 05:43:09 UTC Merge branch 'sg/progress-fix' Byte-order fix the recent update to progress display code. * sg/progress-fix: test-progress: fix test failures on big-endian systems 23 October 2019, 05:43:09 UTC
b895e8d Junio C Hamano 23 October 2019, 05:43:09 UTC Merge branch 'nr/diff-highlight-indent-fix' Code cleanup. * nr/diff-highlight-indent-fix: diff-highlight: fix a whitespace nit 23 October 2019, 05:43:09 UTC
c1ec35d Junio C Hamano 23 October 2019, 05:43:09 UTC Merge branch 'mb/clarify-zsh-completion-doc' The installation instruction for zsh completion script (in contrib/) has been a bit improved. * mb/clarify-zsh-completion-doc: completion: clarify installation instruction for zsh 23 October 2019, 05:43:09 UTC
0eb3671 Johannes Schindelin 23 October 2019, 00:19:38 UTC ci(osx): use new location of the `perforce` cask The Azure Pipelines builds are failing for macOS due to a change in the location of the perforce cask. The command outputs the following error: + brew install caskroom/cask/perforce Error: caskroom/cask was moved. Tap homebrew/cask-cask instead. So let's try to call `brew cask install perforce` first (which is what that error message suggests, in a most round-about way). Prior to 672f51cb we used to install the 'perforce' package with 'brew install perforce' (note: no 'cask' in there). The justification for 672f51cb was that the command 'brew install perforce' simply stopped working, after Homebrew folks decided that it's better to move the 'perforce' package to a "cask". Their justification for this move was that 'brew install perforce' "can fail due to a checksum mismatch ...", and casks can be installed without checksum verification. And indeed, both 'brew cask install perforce' and 'brew install caskroom/cask/perforce' printed something along the lines of: ==> No checksum defined for Cask perforce, skipping verification It is unclear why 672f51cb used 'brew install caskroom/cask/perforce' instead of 'brew cask install perforce'. It appears (by running both commands on old Travis CI macOS images) that both commands worked all the same already back then. In any case, as the error message at the top of this commit message shows, 'brew install caskroom/cask/perforce' has stopped working recently, but 'brew cask install perforce' still does, so let's use that. CI servers are typically fresh virtual machines, but not always. To accommodate for that, let's try harder if `brew cask install perforce` fails, by specifically pulling the latest `master` of the `homebrew-cask` repository. This will still fail, of course, when `homebrew-cask` falls behind Perforce's release schedule. But once it is updated, we can now simply re-run the failed jobs and they will pick up that update. As for updating `homebrew-cask`: the beginnings of automating this in https://dev.azure.com/gitgitgadget/git/_build?definitionId=11&_a=summary will be finished once the next Perforce upgrade comes around. Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 02:46:41 UTC
a8e2c0e Denton Liu 22 October 2019, 09:57:01 UTC t7419: change test_must_fail to ! for grep According to t/README, test_must_fail() should only be used to test for failure in Git commands. Replace the invocations of `test_must_fail grep` with `! grep`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 02:18:28 UTC
19c29e5 Bert Wesarg 21 October 2019, 13:23:42 UTC t4014: make output-directory tests self-contained As noted by Gábor in [1], the new tests in edefc31873 ("format-patch: create leading components of output directory", 2019-10-11) cannot be run independently. Fix this. [1] https://public-inbox.org/git/20191011144650.GM29845@szeder.dev/ Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 02:08:58 UTC
12a4aea Junio C Hamano 23 October 2019, 02:06:46 UTC Merge branch 'js/azure-pipelines-msvc' * js/azure-pipelines-msvc: ci(visual-studio): actually run the tests in parallel ci(visual-studio): use strict compile flags, and optimization 23 October 2019, 02:06:46 UTC
399c23c Johannes Schindelin 21 October 2019, 19:59:58 UTC ci(visual-studio): actually run the tests in parallel Originally, the CI/PR builds that build and test using Visual Studio were implemented imitating `linux-clang`, i.e. still using the `Makefile`-based build infrastructure. Later (but still before the patches made their way into git.git's `master`), however, this was changed to generate Visual Studio project files and build the binaries using `MSBuild`, as this reflects more accurately how Visual Studio users would want to build Git (internally, Visual Studio uses `MSBuild`, or at least something very similar). During that transition, we needed to implement a new way to run the test suite in parallel, as Visual Studio users typically will only have a Git Bash available (which does not ship with `make` nor with support for `prove`): we simply implemented a new test helper to run the test suite. This helper even knows how to run the tests in parallel, but due to a mistake on this developer's part, it was never turned on in the CI/PR builds. This results in 2x-3x longer run times of the test phase. Let's use the `--jobs=10` option to fix this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 02:02:59 UTC
711cd6d Johannes Schindelin 21 October 2019, 19:59:57 UTC ci(visual-studio): use strict compile flags, and optimization To make full use of the work that went into the Visual Studio build & test jobs in our CI/PR builds, let's turn on strict compiler flags. This will give us the benefit of Visual C's compiler warnings (which, at times, seem to catch things that GCC does not catch, and vice versa). While at it, also turn on optimization; It does not make sense to produce binaries with debug information, and we can use any ounce of speed that we get (because the test suite is particularly slow on Windows, thanks to the need to run inside a Unix shell, which requires us to use the POSIX emulation layer provided by MSYS2). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 October 2019, 02:02:57 UTC
370784e Alessandro Menti 21 October 2019, 21:00:52 UTC l10n: it.po: update the Italian translation for Git 2.24.0 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> 22 October 2019, 18:05:10 UTC
cc73c68 Jiang Xin 22 October 2019, 01:47:23 UTC Merge branch 'master' of github.com:jnavila/git into git-po-master * 'master' of github.com:jnavila/git: l10n: fr 2.24.0 rnd 1 22 October 2019, 01:47:23 UTC
907843b Jiang Xin 22 October 2019, 01:16:24 UTC Merge branch 'master' of github.com:alshopov/git-po into git-po-master * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4693) 22 October 2019, 01:16:24 UTC
13bcea8 Jean-Noël Avila 21 October 2019, 18:49:16 UTC l10n: fr 2.24.0 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 21 October 2019, 18:49:16 UTC
135480a Jiang Xin 21 October 2019, 11:57:27 UTC Merge remote-tracking branch 'git-po/master' into git-po-master * git-po/master: l10n: sv.po: Update Swedish translation (4674t0f0u) l10n: Update Catalan translation 21 October 2019, 11:57:27 UTC
3d0a05b Jiang Xin 21 October 2019, 11:56:08 UTC l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) Generate po/git.pot from v2.24.0-rc0 for git v2.24.0 l10n round 1. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> 21 October 2019, 11:56:08 UTC
8da56a4 Stephen Boyd 20 October 2019, 18:52:30 UTC userdiff: fix some corner cases in dts regex While reviewing some dts diffs recently I noticed that the hunk header logic was failing to find the containing node. This is because the regex doesn't consider properties that may span multiple lines, i.e. property = <something>, <something_else>; and it got hung up on comments inside nodes that look like the root node because they start with '/*'. Add tests for these cases and update the regex to find them. Maybe detecting the root node is too complicated but forcing it to be a backslash with any amount of whitespace up to an open bracket seemed OK. I tried to detect that a comment is in-between the two parts but I wasn't happy so I just dropped it. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 October 2019, 08:44:12 UTC
2b6f6ea SZEDER Gábor 19 October 2019, 23:37:06 UTC test-progress: fix test failures on big-endian systems In 't0500-progress-display.sh' all tests running 'test-tool progress --total=<N>' fail on big-endian systems, e.g. like this: + test-tool progress --total=3 Working hard [...] + test_i18ncmp expect out --- expect 2019-10-18 23:07:54.765523916 +0000 +++ out 2019-10-18 23:07:54.773523916 +0000 @@ -1,4 +1,2 @@ -Working hard: 33% (1/3)<CR> -Working hard: 66% (2/3)<CR> -Working hard: 100% (3/3)<CR> -Working hard: 100% (3/3), done. +Working hard: 0% (1/12884901888)<CR> +Working hard: 0% (3/12884901888), done. The reason for that bogus value is that '--total's parameter is parsed via parse-options's OPT_INTEGER into a uint64_t variable [1], so the two bits of 3 end up in the "wrong" bytes on big-endian systems (12884901888 = 0x300000000). Change the type of that variable from uint64_t to int, to match what parse-options expects; in the tests of the progress output we won't use values that don't fit into an int anyway. [1] start_progress() expects the total number as an uint64_t, that's why I chose the same type when declaring the variable holding the value given on the command line. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> [jpag: Debian unstable/ppc64 (big-endian)] Tested-By: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> [tz: Fedora s390x (big-endian)] Tested-By: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 October 2019, 00:53:49 UTC
f757409 Alexander Shopov 19 October 2019, 10:20:43 UTC l10n: bg.po: Updated Bulgarian translation (4693) Synced with 2.24-rc0 Signed-off-by: Alexander Shopov <ash@kambanaria.org> 19 October 2019, 10:20:43 UTC
176f5ad Maxim Belsky 11 October 2019, 17:54:28 UTC completion: clarify installation instruction for zsh The original comment does not describe type of ~/.zsh/_git explicitly and zsh does not warn or fail if a user create it as a dictionary. So unexperienced users could be misled by the original comment. There is a small update to clarify it. Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Maxim Belsky <public.belsky@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2019, 04:55:49 UTC
d966095 Junio C Hamano 18 October 2019, 02:31:00 UTC Git 2.24-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2019, 02:40:50 UTC
90e0d16 Junio C Hamano 18 October 2019, 02:40:50 UTC Merge branch 'rs/remote-curl-use-argv-array' Code cleanup. * rs/remote-curl-use-argv-array: remote-curl: use argv_array in parse_push() 18 October 2019, 02:40:50 UTC
3def8ae Junio C Hamano 18 October 2019, 02:40:49 UTC Merge branch 'rs/column-use-utf8-strnwidth' Code cleanup. * rs/column-use-utf8-strnwidth: column: use utf8_strnwidth() to strip out ANSI color escapes 18 October 2019, 02:40:49 UTC
d0258d0 Junio C Hamano 18 October 2019, 02:40:49 UTC Merge branch 'rs/http-push-simplify' Code cleanup. * rs/http-push-simplify: http-push: simplify deleting a list item 18 October 2019, 02:40:49 UTC
bb52def Junio C Hamano 18 October 2019, 02:40:49 UTC Merge branch 'jj/stash-reset-only-toplevel' "git stash save" lost local changes to submodules, which has been corrected. * jj/stash-reset-only-toplevel: stash: avoid recursive hard reset on submodules 18 October 2019, 02:40:49 UTC
f1afbb0 Junio C Hamano 18 October 2019, 02:40:48 UTC Merge branch 'bw/format-patch-o-create-leading-dirs' "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>" not "mkdir -p <outdir>", which is being corrected. * bw/format-patch-o-create-leading-dirs: format-patch: create leading components of output directory 18 October 2019, 02:40:48 UTC
e5fca6b Junio C Hamano 18 October 2019, 02:40:48 UTC Merge branch 'bb/compat-util-comment-fix' Code cleanup. * bb/compat-util-comment-fix: git-compat-util: fix documentation syntax 18 October 2019, 02:40:48 UTC
43400b4 Junio C Hamano 18 October 2019, 02:40:48 UTC Merge branch 'bb/utf8-wcwidth-cleanup' Code cleanup. * bb/utf8-wcwidth-cleanup: utf8: use ARRAY_SIZE() in git_wcwidth() 18 October 2019, 02:40:48 UTC
07ff6dd Junio C Hamano 18 October 2019, 02:40:48 UTC Merge branch 'dl/allow-running-cocci-verbosely' Dev support update. * dl/allow-running-cocci-verbosely: Makefile: respect $(V) in %.cocci.patch target 18 October 2019, 02:40:48 UTC
2d74d28 Junio C Hamano 18 October 2019, 02:40:47 UTC Merge branch 'dl/compat-cleanup' Code formatting micronit fix. * dl/compat-cleanup: pthread.h: manually align parameter lists 18 October 2019, 02:40:47 UTC
9b83a94 Junio C Hamano 18 October 2019, 02:40:47 UTC Merge branch 'ta/t1308-typofix' Test fix. * ta/t1308-typofix: t1308-config-set: fix a test that has a typo 18 October 2019, 02:40:47 UTC
376012c Junio C Hamano 18 October 2019, 02:40:47 UTC Merge branch 'js/doc-stash-save' Doc clarification. * js/doc-stash-save: doc(stash): clarify the description of `save` 18 October 2019, 02:40:47 UTC
10da030 Carlo Marcelo Arenas Belón 16 October 2019, 12:10:24 UTC grep: avoid leak of chartables in PCRE2 94da9193a6 ("grep: add support for PCRE v2", 2017-06-01) introduced a small memory leak visible with valgrind in t7813. Complete the creation of a PCRE2 specific variable that was missing from the original change and free the generated table just like it is done for PCRE1. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2019, 01:33:18 UTC
513f2b0 Carlo Marcelo Arenas Belón 16 October 2019, 12:10:23 UTC grep: make PCRE2 aware of custom allocator 94da9193a6 (grep: add support for PCRE v2, 2017-06-01) didn't include a way to override the system allocator, and so it is incompatible with custom allocators (e.g. nedmalloc). This problem became obvious when we tried to plug a memory leak by `free()`ing a data structure allocated by PCRE2, triggering a segfault in Windows (where we use nedmalloc by default). PCRE2 requires the use of a general context to override the allocator and therefore, there is a lot more code needed than in PCRE1, including a couple of wrapper functions. Extend the grep API with a "destructor" that could be called to cleanup any objects that were created and used globally. Update `builtin/grep.c` to use that new API, but any other future users should make sure to have matching `grep_init()`/`grep_destroy()` calls if they are using the pattern matching functionality. Move some of the logic that was before done per thread (in the workers) into an earlier phase to avoid degrading performance, but as the use of PCRE2 with custom allocators is better understood it is expected more of its functions will be instructed to use the custom allocator as well as was done in the original code[1] this work was based on. [1] https://public-inbox.org/git/3397e6797f872aedd18c6d795f4976e1c579514b.1565005867.git.gitgitgadget@gmail.com/ Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2019, 01:33:18 UTC
57d4660 Carlo Marcelo Arenas Belón 16 October 2019, 12:10:22 UTC grep: make PCRE1 aware of custom allocator 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) didn't include a way to override the system alocator, and so it is incompatible with USE_NED_ALLOCATOR as reported by Dscho[1] (in similar code from PCRE2) Note that nedmalloc, as well as other custom allocators like jemalloc and mi-malloc, can be configured at runtime (via `LD_PRELOAD`), therefore we cannot know at compile time whether a custom allocator is used or not. Make the minimum change possible to ensure this combination is supported by extending `grep_init()` to set the PCRE1 specific functions to Git's idea of `malloc()` and `free()` and therefore making sure all allocations are done inside PCRE1 with the same allocator than the rest of Git. This change has negligible performance impact: PCRE needs to allocate memory once per program run for the character table and for each pattern compilation. These are both rare events compared to matching patterns against lines. Actual measurements[2] show that the impact is lost in the noise. [1] https://public-inbox.org/git/pull.306.git.gitgitgadget@gmail.com [2] https://public-inbox.org/git/7f42007f-911b-c570-17f6-1c6af0429586@web.de Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2019, 01:33:16 UTC
6f11942 brian m. carlson 16 October 2019, 23:45:34 UTC remote-curl: pass on atomic capability to remote side When pushing more than one reference with the --atomic option, the server is supposed to perform a single atomic transaction to update the references, leaving them either all to succeed or all to fail. This works fine when pushing locally or over SSH, but when pushing over HTTP, we fail to pass the atomic capability to the remote side. In fact, we have not reported this capability to any remote helpers during the life of the feature. Now normally, things happen to work nevertheless, since we actually check for most types of failures, such as non-fast-forward updates, on the client side, and just abort the entire attempt. However, if the server side reports a problem, such as the inability to lock a ref, the transaction isn't atomic, because we haven't passed the appropriate capability over and the remote side has no way of knowing that we wanted atomic behavior. Fix this by passing the option from the transport code through to remote helpers, and from the HTTP remote helper down to send-pack. With this change, we can detect if the server side rejects the push and report back appropriately. Note the difference in the messages: the remote side reports "atomic transaction failed", while our own checking rejects pushes with the message "atomic push failed". Document the atomic option in the remote helper documentation, so other implementers can implement it if they like. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 October 2019, 07:08:22 UTC
3b3c79f Norman Rasmussen 15 October 2019, 03:31:26 UTC diff-highlight: fix a whitespace nit This changes the indent from "<tab><sp><sp><sp><sp><sp><sp><sp><sp>" to "<tab><tab>" so that the statement lines up with the rest of the block. Signed-off-by: Norman Rasmussen <norman@rasmussen.co.za> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 October 2019, 05:08:37 UTC
108b97d Junio C Hamano 15 October 2019, 04:31:50 UTC Ninth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 October 2019, 04:48:04 UTC
cbe8cdd Junio C Hamano 15 October 2019, 04:48:03 UTC Merge branch 'jk/coc' Code-of-conduct document. * jk/coc: CODE_OF_CONDUCT: mention individual project-leader emails add a Code of Conduct document 15 October 2019, 04:48:04 UTC
3b9ec27 Junio C Hamano 15 October 2019, 04:48:03 UTC Merge branch 'js/trace2-fetch-push' Dev support. * js/trace2-fetch-push: transport: push codepath can take arbitrary repository push: add trace2 instrumentation fetch: add trace2 instrumentation 15 October 2019, 04:48:03 UTC
c7d2ced Junio C Hamano 15 October 2019, 04:48:03 UTC Merge branch 'jt/push-avoid-lazy-fetch' Performance hack. * jt/push-avoid-lazy-fetch: send-pack: never fetch when checking exclusions 15 October 2019, 04:48:03 UTC
1ef3bd3 Junio C Hamano 15 October 2019, 04:48:03 UTC Merge branch 'dl/format-patch-doc-test-cleanup' test cleanup. * dl/format-patch-doc-test-cleanup: t4014: treat rev-list output as the expected value 15 October 2019, 04:48:03 UTC
eb3de5b Junio C Hamano 15 October 2019, 04:48:03 UTC Merge branch 'js/xdiffi-comment-updates' Comment update. * js/xdiffi-comment-updates: xdiffi: fix typos and touch up comments 15 October 2019, 04:48:03 UTC
4e8371e Junio C Hamano 15 October 2019, 04:48:02 UTC Merge branch 'dl/t0000-skip-test-test' test update. * dl/t0000-skip-test-test: t0000: cover GIT_SKIP_TESTS blindspots 15 October 2019, 04:48:02 UTC
b6d712f Junio C Hamano 15 October 2019, 04:48:02 UTC Merge branch 'tg/range-diff-output-update' "git range-diff" failed to handle mode-only change, which has been corrected. * tg/range-diff-output-update: range-diff: don't segfault with mode-only changes 15 October 2019, 04:48:02 UTC
7745887 Junio C Hamano 15 October 2019, 04:48:02 UTC Merge branch 'gs/sq-quote-buf-pretty' Pretty-printed command line formatter (used in e.g. reporting the command being run by the tracing API) had a bug that lost an argument that is an empty string, which has been corrected. * gs/sq-quote-buf-pretty: sq_quote_buf_pretty: don't drop empty arguments 15 October 2019, 04:48:02 UTC
5efabc7 Junio C Hamano 15 October 2019, 04:48:01 UTC Merge branch 'ew/hashmap' Code clean-up of the hashmap API, both users and implementation. * ew/hashmap: hashmap_entry: remove first member requirement from docs hashmap: remove type arg from hashmap_{get,put,remove}_entry OFFSETOF_VAR macro to simplify hashmap iterators hashmap: introduce hashmap_free_entries hashmap: hashmap_{put,remove} return hashmap_entry * hashmap: use *_entry APIs for iteration hashmap_cmp_fn takes hashmap_entry params hashmap_get{,_from_hash} return "struct hashmap_entry *" hashmap: use *_entry APIs to wrap container_of hashmap_get_next returns "struct hashmap_entry *" introduce container_of macro hashmap_put takes "struct hashmap_entry *" hashmap_remove takes "const struct hashmap_entry *" hashmap_get takes "const struct hashmap_entry *" hashmap_add takes "struct hashmap_entry *" hashmap_get_next takes "const struct hashmap_entry *" hashmap_entry_init takes "struct hashmap_entry *" packfile: use hashmap_entry in delta_base_cache_entry coccicheck: detect hashmap_entry.hash assignment diff: use hashmap_entry_init on moved_entry.ent 15 October 2019, 04:48:02 UTC
d0ce4d9 Junio C Hamano 15 October 2019, 04:48:01 UTC Merge branch 'js/trace2-cap-max-output-files' The trace2 output, when sending them to files in a designated directory, can populate the directory with too many files; a mechanism is introduced to set the maximum number of files and discard further logs when the maximum is reached. * js/trace2-cap-max-output-files: trace2: write discard message to sentinel files trace2: discard new traces if target directory has too many files docs: clarify trace2 version invariants docs: mention trace2 target-dir mode in git-config 15 October 2019, 04:48:01 UTC
6ed610b Junio C Hamano 15 October 2019, 04:48:01 UTC Merge branch 'am/t0028-utf16-tests' Test fixes. * am/t0028-utf16-tests: t0028: add more tests t0028: fix test for UTF-16-LE-BOM 15 October 2019, 04:48:01 UTC
5b900fb Junio C Hamano 15 October 2019, 04:48:01 UTC Merge branch 'dl/octopus-graph-bug' "git log --graph" for an octopus merge is sometimes colored incorrectly, which is demonstrated and documented but not yet fixed. * dl/octopus-graph-bug: t4214: demonstrate octopus graph coloring failure t4214: explicitly list tags in log t4214: generate expect in their own test cases t4214: use test_merge test-lib: let test_merge() perform octopus merges 15 October 2019, 04:48:01 UTC
16d9d71 Junio C Hamano 15 October 2019, 04:48:00 UTC Merge branch 'en/fast-imexport-nested-tags' Updates to fast-import/export. * en/fast-imexport-nested-tags: fast-export: handle nested tags t9350: add tests for tags of things other than a commit fast-export: allow user to request tags be marked with --mark-tags fast-export: add support for --import-marks-if-exists fast-import: add support for new 'alias' command fast-import: allow tags to be identified by mark labels fast-import: fix handling of deleted tags fast-export: fix exporting a tag and nothing else 15 October 2019, 04:48:00 UTC
6d5291b Junio C Hamano 15 October 2019, 04:48:00 UTC Merge branch 'js/azure-pipelines-msvc' CI updates. * js/azure-pipelines-msvc: ci: also build and test with MS Visual Studio on Azure Pipelines ci: really use shallow clones on Azure Pipelines tests: let --immediate and --write-junit-xml play well together test-tool run-command: learn to run (parts of) the testsuite vcxproj: include more generated files vcxproj: only copy `git-remote-http.exe` once it was built msvc: work around a bug in GetEnvironmentVariable() msvc: handle DEVELOPER=1 msvc: ignore some libraries when linking compat/win32/path-utils.h: add #include guards winansi: use FLEX_ARRAY to avoid compiler warning msvc: avoid using minus operator on unsigned types push: do not pretend to return `int` from `die_push_simple()` 15 October 2019, 04:48:00 UTC
ccc2899 Junio C Hamano 15 October 2019, 04:48:00 UTC Merge branch 'gs/commit-graph-trace-with-cmd' Dev support. * gs/commit-graph-trace-with-cmd: commit-graph: emit trace2 cmd_mode for each sub-command 15 October 2019, 04:48:00 UTC
d96e31e Junio C Hamano 15 October 2019, 04:48:00 UTC Merge branch 'js/fetch-jobs' "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching submodules, but this did not apply to "git fetch --multiple" that fetches from multiple remote repositories. It now does. * js/fetch-jobs: fetch: let --jobs=<n> parallelize --multiple, too 15 October 2019, 04:48:00 UTC
280bd44 Junio C Hamano 15 October 2019, 04:47:59 UTC Merge branch 'en/merge-recursive-cleanup' The merge-recursive machiery is one of the most complex parts of the system that accumulated cruft over time. This large series cleans up the implementation quite a bit. * en/merge-recursive-cleanup: (26 commits) merge-recursive: fix the fix to the diff3 common ancestor label merge-recursive: fix the diff3 common ancestor label for virtual commits merge-recursive: alphabetize include list merge-recursive: add sanity checks for relevant merge_options merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* merge-recursive: split internal fields into a separate struct merge-recursive: avoid losing output and leaking memory holding that output merge-recursive: comment and reorder the merge_options fields merge-recursive: consolidate unnecessary fields in merge_options merge-recursive: move some definitions around to clean up the header merge-recursive: rename merge_options argument to opt in header merge-recursive: rename 'mrtree' to 'result_tree', for clarity merge-recursive: use common name for ancestors/common/base_list merge-recursive: fix some overly long lines cache-tree: share code between functions writing an index as a tree merge-recursive: don't force external callers to do our logging merge-recursive: remove useless parameter in merge_trees() merge-recursive: exit early if index != head Ensure index matches head before invoking merge machinery, round N merge-recursive: remove another implicit dependency on the_repository ... 15 October 2019, 04:47:59 UTC
062a309 René Scharfe 13 October 2019, 13:37:39 UTC remote-curl: use argv_array in parse_push() Use argv_array to build an array of strings instead of open-coding it. This simplifies the code a bit. We also need to make the specs parameter of push(), push_dav() and push_git() const to match the argv member of the argv_array. That's fine, as all three only actually read from the specs array anyway. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 October 2019, 01:55:11 UTC
back to top