* Re: [PATCH v2] doc: remove unneeded TODO for release_commit_memory
2019-01-02 11:17 0% ` Duy Nguyen
@ 2019-01-03 7:21 0% ` Junio C Hamano
0 siblings, 0 replies; 20+ results
From: Junio C Hamano @ 2019-01-03 7:21 UTC (permalink / raw)
To: Duy Nguyen; +Cc: Albert Burt, Git Mailing List, Stefan Beller
Duy Nguyen <pclouds@gmail.com> writes:
> On Wed, Jan 2, 2019 at 3:09 AM Albert Burt <aburthinds@gmail.com> wrote:
>>
>> Remove TODO that was left in from:
>> commit 110240588d (Merge branch 'sb/object-store-alloc' - 2018-06-25)
>>
>> Todo can be removed as:
>> 9d2c97016f (commit.h: delete 'util' field in struct commit - 2018-05-19)
>> deletes commit->util.
>>
>> Signed-off-by: Albert Burt <aburthinds@gmail.com>
>> ---
>>
>> Thanks for looking at this for me Duy. I updated some of the changes you
>> suggested.
>>
>> Let me know if there's anything else that I would need to clean up, or do better.
>> :)
>
> Nope. The patch looks good to me.
Yes, but we'll fix this with 6a7895fd ("commit: prepare
free_commit_buffer and release_commit_memory for any repo",
2018-12-14) anyway, so I am not sure if this is worth pursuing
separately.
>
>>
>> commit.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/commit.c b/commit.c
>> index 2d94e0b199..2ff6dca0bc 100644
>> --- a/commit.c
>> +++ b/commit.c
>> @@ -357,8 +357,6 @@ void release_commit_memory(struct commit *c)
>> c->index = 0;
>> free_commit_buffer(c);
>> free_commit_list(c->parents);
>> - /* TODO: what about commit->util? */
>> -
>> c->object.parsed = 0;
>> }
>>
>> --
>> 2.17.2 (Apple Git-113)
>>
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2] doc: remove unneeded TODO for release_commit_memory
2019-01-01 20:08 4% ` [PATCH v2] " Albert Burt
@ 2019-01-02 11:17 0% ` Duy Nguyen
2019-01-03 7:21 0% ` Junio C Hamano
0 siblings, 1 reply; 20+ results
From: Duy Nguyen @ 2019-01-02 11:17 UTC (permalink / raw)
To: Albert Burt; +Cc: Git Mailing List, Junio C Hamano, Stefan Beller
On Wed, Jan 2, 2019 at 3:09 AM Albert Burt <aburthinds@gmail.com> wrote:
>
> Remove TODO that was left in from:
> commit 110240588d (Merge branch 'sb/object-store-alloc' - 2018-06-25)
>
> Todo can be removed as:
> 9d2c97016f (commit.h: delete 'util' field in struct commit - 2018-05-19)
> deletes commit->util.
>
> Signed-off-by: Albert Burt <aburthinds@gmail.com>
> ---
>
> Thanks for looking at this for me Duy. I updated some of the changes you
> suggested.
>
> Let me know if there's anything else that I would need to clean up, or do better.
> :)
Nope. The patch looks good to me.
>
> commit.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/commit.c b/commit.c
> index 2d94e0b199..2ff6dca0bc 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -357,8 +357,6 @@ void release_commit_memory(struct commit *c)
> c->index = 0;
> free_commit_buffer(c);
> free_commit_list(c->parents);
> - /* TODO: what about commit->util? */
> -
> c->object.parsed = 0;
> }
>
> --
> 2.17.2 (Apple Git-113)
>
--
Duy
^ permalink raw reply [relevance 0%]
* [PATCH v2] doc: remove unneeded TODO for release_commit_memory
2019-01-01 10:40 4% ` Duy Nguyen
@ 2019-01-01 20:08 4% ` Albert Burt
2019-01-02 11:17 0% ` Duy Nguyen
0 siblings, 1 reply; 20+ results
From: Albert Burt @ 2019-01-01 20:08 UTC (permalink / raw)
To: pclouds; +Cc: git, gitster, stefanbeller, Albert Burt
Remove TODO that was left in from:
commit 110240588d (Merge branch 'sb/object-store-alloc' - 2018-06-25)
Todo can be removed as:
9d2c97016f (commit.h: delete 'util' field in struct commit - 2018-05-19)
deletes commit->util.
Signed-off-by: Albert Burt <aburthinds@gmail.com>
---
Thanks for looking at this for me Duy. I updated some of the changes you
suggested.
Let me know if there's anything else that I would need to clean up, or do better.
:)
commit.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/commit.c b/commit.c
index 2d94e0b199..2ff6dca0bc 100644
--- a/commit.c
+++ b/commit.c
@@ -357,8 +357,6 @@ void release_commit_memory(struct commit *c)
c->index = 0;
free_commit_buffer(c);
free_commit_list(c->parents);
- /* TODO: what about commit->util? */
-
c->object.parsed = 0;
}
--
2.17.2 (Apple Git-113)
^ permalink raw reply related [relevance 4%]
* Re: [PATCH] doc: remove unneeded TODO for release_commit_memory
@ 2019-01-01 10:40 4% ` Duy Nguyen
2019-01-01 20:08 4% ` [PATCH v2] " Albert Burt
0 siblings, 1 reply; 20+ results
From: Duy Nguyen @ 2019-01-01 10:40 UTC (permalink / raw)
To: Albert Burt; +Cc: Git Mailing List, Junio C Hamano, Stefan Beller
On Tue, Jan 1, 2019 at 7:02 AM Albert Burt <aburthinds@gmail.com> wrote:
>
> The code that was merged with commit 1102405 left in an TODO that
People usually use something this to produce the commit reference
git show -s --date=short --pretty='format:%h (%s - %ad)'
which produces
110240588d (Merge branch 'sb/object-store-alloc' - 2018-06-25)
> is no longer relevant. It seems as if we can remove this todo.
> util seems to not be a field of the struct commit,
> definition of struct commit --> commit.c:27
> The commit list also, does not contain a field for util.
There was commit->util, which was deleted in 9d2c97016f (commit.h:
delete 'util' field in struct commit - 2018-05-19). You can mention it
too if you reroll this patch.
> ____
> By making a contribution to this project, I certify that:
>
> a. The contribution was created in whole or in part by me and I
> have the right to submit it under the open source license
> indicated in the file; or
>
> b. The contribution is based upon previous work that, to the best
> of my knowledge, is covered under an appropriate open source
> license and I have the right under that license to submit that
> work with modifications, whether created in whole or in part
> by me, under the same open source license (unless I am
> permitted to submit under a different license), as indicated
> in the file; or
>
> c. The contribution was provided directly to me by some other
> person who certified (a), (b) or (c) and I have not modified
> it.
>
> d. I understand and agree that this project and the contribution
> are public and that a record of the contribution (including all
> personal information I submit with it, including my sign-off) is
> maintained indefinitely and may be redistributed consistent with
> this project or the open source license(s) involved.
> ____
I think you can drop this. Your S-o-b below implies all this.
> Signed-off-by: Albert Burt <aburthinds@gmail.com>
> ---
> commit.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/commit.c b/commit.c
> index 2d94e0b199..2ff6dca0bc 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -357,8 +357,6 @@ void release_commit_memory(struct commit *c)
> c->index = 0;
> free_commit_buffer(c);
> free_commit_list(c->parents);
> - /* TODO: what about commit->util? */
> -
Obviously correct :)
> c->object.parsed = 0;
> }
>
> --
> 2.17.2 (Apple Git-113)
>
--
Duy
^ permalink raw reply [relevance 4%]
* Re: [PATCH 00/21] Kill the_index part 4
2018-08-27 17:32 5% ` Stefan Beller
@ 2018-08-28 19:32 0% ` Duy Nguyen
0 siblings, 0 replies; 20+ results
From: Duy Nguyen @ 2018-08-28 19:32 UTC (permalink / raw)
To: Stefan Beller; +Cc: Git Mailing List
On Mon, Aug 27, 2018 at 7:32 PM Stefan Beller <sbeller@google.com> wrote:
> > Besides some small conflicts on 'pu', like the previous part, it also
> > breaks 'pu' because of API changes. The fix is trivial though, just
> > prepend the_repository as the first argument for the broken function
> > calls.
>
> This sounds like a problem. I said the same when sending the
> object store lookup series, which ended via
> 3a2a1dc1707 (Merge branch 'sb/object-store-lookup', 2018-08-02)
> in master, but I do recall Junio being somewhat unhappy about it[1].
>
> By just adding the argument to the function, it might merge easily
> but not compile, which would have to be fixed up; and that object store
> series seemed to touch a lot of functions that were also used in series
> in-flight.
Which is why I state it clearly here so Junio could choose not to pick
this series up (I'm totally ok with that, I could wait until the dust
settles and send again).
Another option is me adding a patch that renames diff_setup() to
diff_setup2() or something that takes 'struct repository *', leaving
diff_setup() as a light wrapper around diff_setup2(). I would need to
wait until in-flight series are merged, then rename diff_setup2() back
to diff_setup(). Not sure if it's worth doing.
> > diff.c | 259 +++++++++++++++++++++++------------------
>
> Ugh? That sounds like there is an interesting change coming.
Yeah. sequencer.c also needs struct repository in lots of places
(sha1-name.c comes second). But at least builtin/ code looks a lot
like it's supposed to be when 'struct repository *' is introduced, we
now have lots of function calls there that pass the_repository...
--
Duy
^ permalink raw reply [relevance 0%]
* Re: [PATCH 00/21] Kill the_index part 4
@ 2018-08-27 17:32 5% ` Stefan Beller
2018-08-28 19:32 0% ` Duy Nguyen
0 siblings, 1 reply; 20+ results
From: Stefan Beller @ 2018-08-27 17:32 UTC (permalink / raw)
To: Duy Nguyen; +Cc: git
On Sun, Aug 26, 2018 at 3:03 AM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
>
> This continues the journey of getting rid of the_index at least in
> library code. The focus of part 4 is diff code. Since 'struct
> repository *' is passed around more (and even more in part 5), I take
> this opportunity to remove some the_repository references too.
yay! Thank you for continuing on the_index!
>
> Besides some small conflicts on 'pu', like the previous part, it also
> breaks 'pu' because of API changes. The fix is trivial though, just
> prepend the_repository as the first argument for the broken function
> calls.
This sounds like a problem. I said the same when sending the
object store lookup series, which ended via
3a2a1dc1707 (Merge branch 'sb/object-store-lookup', 2018-08-02)
in master, but I do recall Junio being somewhat unhappy about it[1].
By just adding the argument to the function, it might merge easily
but not compile, which would have to be fixed up; and that object store
series seemed to touch a lot of functions that were also used in series
in-flight.
I have since lost track of the refactoring and focused more on
submodules again, but plan to come back to more 'repositorification'.
> After this and ~20 more patches in part5, the_index is gone from
> library code.
This sounds promising! I'll take a look.
> diff.c | 259 +++++++++++++++++++++++------------------
Ugh? That sounds like there is an interesting change coming.
Stefan
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Aug 2018, #01; Thu, 2)
@ 2018-08-02 23:02 4% Junio C Hamano
0 siblings, 0 replies; 20+ results
From: Junio C Hamano @ 2018-08-02 23:02 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Many topics have moved to 'master' and 'next' from 'next' to 'pu'
respectively.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ab/checkout-default-remote (2018-06-11) 8 commits
(merged to 'next' on 2018-07-24 at 6ef645f485)
+ checkout & worktree: introduce checkout.defaultRemote
+ checkout: add advice for ambiguous "checkout <branch>"
+ builtin/checkout.c: use "ret" variable for return
+ checkout: pass the "num_matches" up to callers
+ checkout.c: change "unique" member to "num_matches"
+ checkout.c: introduce an *_INIT macro
+ checkout.h: wrap the arguments to unique_tracking_name()
+ checkout tests: index should be clean after dwim checkout
(this branch is used by ab/test-must-be-empty.)
"git checkout" and "git worktree add" learned to honor
checkout.defaultRemote when auto-vivifying a local branch out of a
remote tracking branch in a repository with multiple remotes that
have tracking branches that share the same names.
* bc/object-id (2018-07-16) 16 commits
(merged to 'next' on 2018-07-24 at 23680778a9)
+ pretty: switch hard-coded constants to the_hash_algo
+ sha1-file: convert constants to uses of the_hash_algo
+ log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
+ diff: switch GIT_SHA1_HEXSZ to use the_hash_algo
+ builtin/merge-recursive: make hash independent
+ builtin/merge: switch to use the_hash_algo
+ builtin/fmt-merge-msg: make hash independent
+ builtin/update-index: simplify parsing of cacheinfo
+ builtin/update-index: convert to using the_hash_algo
+ refs/files-backend: use the_hash_algo for writing refs
+ sha1-name: use the_hash_algo when parsing object names
+ strbuf: allocate space with GIT_MAX_HEXSZ
+ commit: express tree entry constants in terms of the_hash_algo
+ hex: switch to using the_hash_algo
+ tree-walk: replace hard-coded constants with the_hash_algo
+ cache: update object ID functions for the_hash_algo
Conversion from uchar[40] to struct object_id continues.
* bc/sequencer-export-work-tree-as-well (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at 0b83ade721)
+ sequencer: pass absolute GIT_WORK_TREE to exec commands
"git rebase" started exporting GIT_DIR environment variable and
exposing it to hook scripts when part of it got rewritten in C.
Instead of matching the old scripted Porcelains' behaviour,
compensate by also exporting GIT_WORK_TREE environment as well to
lessen the damage. This can harm existing hooks that want to
operate on different repository, but the current behaviour is
already broken for them anyway.
* bp/test-drop-caches-for-windows (2018-07-12) 1 commit
(merged to 'next' on 2018-07-24 at 257bb336c6)
+ handle lower case drive letters on Windows
A test helper update for Windows.
* ds/commit-graph-fsck (2018-07-16) 23 commits
(merged to 'next' on 2018-07-24 at 6a802adc7a)
+ coccinelle: update commit.cocci
+ commit-graph: update design document
+ gc: automatically write commit-graph files
+ commit-graph: add '--reachable' option
+ commit-graph: use string-list API for input
+ fsck: verify commit-graph
+ commit-graph: verify contents match checksum
+ commit-graph: test for corrupted octopus edge
+ commit-graph: verify commit date
+ commit-graph: verify generation number
+ commit-graph: verify parent list
+ commit-graph: verify root tree OIDs
+ commit-graph: verify objects exist
+ commit-graph: verify corrupt OID fanout and lookup
+ commit-graph: verify required chunks are present
+ commit-graph: verify catches corrupt signature
+ commit-graph: add 'verify' subcommand
+ commit-graph: load a root tree from specific graph
+ commit: force commit to parse from object database
+ commit-graph: parse commit from chosen graph
+ commit-graph: fix GRAPH_MIN_SIZE
+ commit-graph: UNLEAK before die()
+ t5318-commit-graph.sh: use core.commitGraph
(this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
"git fsck" learns to make sure the optional commit-graph file is in
a sane state.
* en/dirty-merge-fixes (2018-07-11) 9 commits
(merged to 'next' on 2018-07-24 at 7b6ca3507c)
+ merge: fix misleading pre-merge check documentation
+ merge-recursive: enforce rule that index matches head before merging
+ t6044: add more testcases with staged changes before a merge is invoked
+ merge-recursive: fix assumption that head tree being merged is HEAD
+ merge-recursive: make sure when we say we abort that we actually abort
+ t6044: add a testcase for index matching head, when head doesn't match HEAD
+ t6044: verify that merges expected to abort actually abort
+ index_has_changes(): avoid assuming operating on the_index
+ read-cache.c: move index_has_changes() from merge.c
The recursive merge strategy did not properly ensure there was no
change between HEAD and the index before performing its operation,
which has been corrected.
* en/t6036-merge-recursive-tests (2018-07-11) 6 commits
(merged to 'next' on 2018-07-24 at 75055cb6e1)
+ t6036: add a failed conflict detection case: regular files, different modes
+ t6036: add a failed conflict detection case with conflicting types
+ t6036: add a failed conflict detection case with submodule add/add
+ t6036: add a failed conflict detection case with submodule modify/modify
+ t6036: add a failed conflict detection case with symlink add/add
+ t6036: add a failed conflict detection case with symlink modify/modify
Tests to cover various conflicting cases have been added for
merge-recursive.
* en/t6036-recursive-corner-cases (2018-07-12) 2 commits
(merged to 'next' on 2018-07-24 at b7b3514ef4)
+ t6036: fix broken && chain in sub-shell
+ t6036: add lots of detail for directory/file conflicts in recursive case
Tests to cover more D/F conflict cases have been added for
merge-recursive.
* en/t6042-insane-merge-rename-testcases (2018-07-03) 3 commits
(merged to 'next' on 2018-07-24 at 65c80f72da)
+ t6042: add testcase covering long chains of rename conflicts
+ t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
+ t6042: add testcase covering rename/add/delete conflict type
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
I am not sure if there is a single "correct" answer everybody can
agree on for each of these "insane" cases, though.
* en/t7405-recursive-submodule-conflicts (2018-07-11) 3 commits
(merged to 'next' on 2018-07-24 at 6cb7d02298)
+ t7405: verify 'merge --abort' works after submodule/path conflicts
+ t7405: add a directory/submodule conflict
+ t7405: add a file/submodule conflict
Tests to cover conflict cases that involve submodules have been
added for merge-recursive.
* es/chain-lint-in-subshell (2018-07-31) 11 commits
(merged to 'next' on 2018-07-31 at 4ce2a8faa4)
+ t/chainlint.sed: drop extra spaces from regex character class
(merged to 'next' on 2018-07-24 at 9370bbdfaf)
+ t/chainlint: add chainlint "specialized" test cases
+ t/chainlint: add chainlint "complex" test cases
+ t/chainlint: add chainlint "cuddled" test cases
+ t/chainlint: add chainlint "loop" and "conditional" test cases
+ t/chainlint: add chainlint "nested subshell" test cases
+ t/chainlint: add chainlint "one-liner" test cases
+ t/chainlint: add chainlint "whitespace" test cases
+ t/chainlint: add chainlint "basic" test cases
+ t/Makefile: add machinery to check correctness of chainlint.sed
+ t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
(this branch uses es/test-fixes.)
Look for broken "&&" chains that are hidden in subshell, many of
which have been found and corrected.
* es/test-fixes (2018-07-17) 26 commits
(merged to 'next' on 2018-07-24 at fd6796a3ef)
+ t5608: fix broken &&-chain
+ t9119: fix broken &&-chains
+ t9000-t9999: fix broken &&-chains
+ t7000-t7999: fix broken &&-chains
+ t6000-t6999: fix broken &&-chains
+ t5000-t5999: fix broken &&-chains
+ t4000-t4999: fix broken &&-chains
+ t3030: fix broken &&-chains
+ t3000-t3999: fix broken &&-chains
+ t2000-t2999: fix broken &&-chains
+ t1000-t1999: fix broken &&-chains
+ t0000-t0999: fix broken &&-chains
+ t9814: simplify convoluted check that command correctly errors out
+ t9001: fix broken "invoke hook" test
+ t7810: use test_expect_code() instead of hand-rolled comparison
+ t7400: fix broken "submodule add/reconfigure --force" test
+ t7201: drop pointless "exit 0" at end of subshell
+ t6036: fix broken "merge fails but has appropriate contents" tests
+ t5505: modernize and simplify hard-to-digest test
+ t5406: use write_script() instead of birthing shell script manually
+ t5405: use test_must_fail() instead of checking exit code manually
+ t/lib-submodule-update: fix "absorbing" test
+ t: drop unnecessary terminating semicolon in subshell
+ t: use sane_unset() rather than 'unset' with broken &&-chain
+ t: use test_write_lines() instead of series of 'echo' commands
+ t: use test_might_fail() instead of manipulating exit code manually
(this branch is used by es/chain-lint-in-subshell.)
Test clean-up and corrections.
* is/parsing-line-range (2018-06-15) 2 commits
(merged to 'next' on 2018-07-24 at a06b453f32)
+ log: prevent error if line range ends past end of file
+ blame: prevent error if range ends past end of file
Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
take has been tweaked.
* jk/fsck-gitmodules-gently (2018-07-16) 6 commits
(merged to 'next' on 2018-07-24 at 5b15c800db)
+ fsck: downgrade gitmodulesParse default to "info"
+ fsck: split ".gitmodules too large" error from parse failure
+ fsck: silence stderr when parsing .gitmodules
+ config: add options parameter to git_config_from_mem
+ config: add CONFIG_ERROR_SILENT handler
+ config: turn die_on_error into caller-facing enum
Recent "security fix" to pay attention to contents of ".gitmodules"
while accepting "git push" was a bit overly strict than necessary,
which has been adjusted.
* jk/has-uncommitted-changes-fix (2018-07-11) 1 commit
(merged to 'next' on 2018-07-24 at 2ea14c0afb)
+ has_uncommitted_changes(): fall back to empty tree
"git pull --rebase" on a corrupt HEAD caused a segfault. In
general we substitute an empty tree object when running the in-core
equivalent of the diff-index command, and the codepath has been
corrected to do so as well to fix this issue.
* jm/cache-entry-from-mem-pool (2018-07-03) 8 commits
(merged to 'next' on 2018-07-24 at 9be51a88dc)
+ block alloc: add validations around cache_entry lifecyle
+ block alloc: allocate cache entries from mem_pool
+ mem-pool: fill out functionality
+ mem-pool: add life cycle management functions
+ mem-pool: only search head block for available space
+ block alloc: add lifecycle APIs for cache_entry structs
+ read-cache: teach make_cache_entry to take object_id
+ read-cache: teach refresh_cache_entry to take istate
For a large tree, the index needs to hold many cache entries
allocated on heap. These cache entries are now allocated out of a
dedicated memory pool to amortize malloc(3) overhead.
This makes each cache-entry larger by either 4 or 8 bytes, which is
a bit sad, though.
* jm/send-email-tls-auth-on-batch (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at fb3e653f44)
+ send-email: fix tls AUTH when sending batch
"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.
This is marked to be merged to 'next' already, but I do not mind
getting an updated version with an improved log message before that
happens.
* js/rebase-merge-octopus (2018-07-11) 3 commits
(merged to 'next' on 2018-07-24 at 14ad8699de)
+ rebase --rebase-merges: adjust man page for octopus support
+ rebase --rebase-merges: add support for octopus merges
+ merge: allow reading the merge commit message from a file
"git rebase --rebase-merges" mode now handles octopus merges as
well.
* jt/commit-graph-per-object-store (2018-07-17) 7 commits
(merged to 'next' on 2018-07-24 at 090d1a4d59)
+ commit-graph: add repo arg to graph readers
+ commit-graph: store graph in struct object_store
+ commit-graph: add free_commit_graph
+ commit-graph: add missing forward declaration
+ object-store: add missing include
+ commit-graph: refactor preparing commit graph
+ Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store
(this branch is used by ds/commit-graph-with-grafts and ds/reachable; uses ds/commit-graph-fsck and sb/object-store-lookup.)
The singleton commit-graph in-core instance is made per in-core
repository instance.
* jt/fetch-nego-tip (2018-07-03) 1 commit
(merged to 'next' on 2018-07-24 at a9e299006d)
+ fetch-pack: support negotiation tip whitelist
(this branch is used by ab/fetch-nego; uses jt/fetch-pack-negotiator; is tangled with jt/fetch-negotiator-skipping.)
"git fetch" learned a new option "--negotiation-tip" to limit the
set of commits it tells the other end as "have", to reduce wasted
bandwidth and cycles, which would be helpful when the receiving
repository has a lot of refs that have little to do with the
history at the remote it is fetching from.
* jt/fetch-negotiator-skipping (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at 8e25a49405)
+ negotiator/skipping: skip commits during fetch
(this branch is used by ab/fetch-nego; uses jt/fetch-pack-negotiator; is tangled with jt/fetch-nego-tip.)
Add a server-side knob to skip commits in exponential/fibbonacci
stride in an attempt to cover wider swath of history with a smaller
number of iterations, potentially accepting a larger packfile
transfer, instead of going back one commit a time during common
ancestor discovery during the "git fetch" transaction.
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
(merged to 'next' on 2018-07-24 at 438efcd6b1)
+ fetch-pack: introduce negotiator API
+ fetch-pack: move common check and marking together
+ fetch-pack: make negotiation-related vars local
+ fetch-pack: use ref adv. to prune "have" sent
+ fetch-pack: directly end negotiation if ACK ready
+ fetch-pack: clear marks before re-marking
+ fetch-pack: split up everything_local()
(this branch is used by ab/fetch-nego, jt/fetch-nego-tip and jt/fetch-negotiator-skipping.)
Code restructuring and a small fix to transport protocol v2 during
fetching.
* jt/tags-to-promised-blobs-fix (2018-07-16) 2 commits
(merged to 'next' on 2018-07-24 at 8d7e78a671)
+ tag: don't warn if target is missing but promised
+ revision: tolerate promised targets of tags
The lazy clone support had a few places where missing but promised
objects were not correctly tolerated, which have been fixed.
* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
(merged to 'next' on 2018-07-24 at 71c05d27b6)
+ gc --auto: release pack files before auto packing
"git gc --auto" opens file descriptors for the packfiles before
spawning "git repack/prune", which would upset Windows that does
not want a process to work on a file that is open by another
process. The issue has been worked around.
* sb/diff-color-move-more (2018-07-19) 10 commits
(merged to 'next' on 2018-07-24 at 89c893cab2)
+ diff.c: offer config option to control ws handling in move detection
+ diff.c: add white space mode to move detection that allows indent changes
+ diff.c: factor advance_or_nullify out of mark_color_as_moved
+ diff.c: decouple white space treatment from move detection algorithm
+ diff.c: add a blocks mode for moved code detection
+ diff.c: adjust hash function signature to match hashmap expectation
+ diff.c: do not pass diff options as keydata to hashmap
+ t4015: avoid git as a pipe input
+ xdiff/xdiffi.c: remove unneeded function declarations
+ xdiff/xdiff.h: remove unused flags
"git diff --color-moved" feature has further been tweaked.
* sb/object-store-lookup (2018-06-29) 33 commits
(merged to 'next' on 2018-07-24 at dd96e29376)
+ commit.c: allow lookup_commit_reference to handle arbitrary repositories
+ commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories
+ tag.c: allow deref_tag to handle arbitrary repositories
+ object.c: allow parse_object to handle arbitrary repositories
+ object.c: allow parse_object_buffer to handle arbitrary repositories
+ commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
+ commit.c: allow set_commit_buffer to handle arbitrary repositories
+ commit.c: migrate the commit buffer to the parsed object store
+ commit-slabs: remove realloc counter outside of slab struct
+ commit.c: allow parse_commit_buffer to handle arbitrary repositories
+ tag: allow parse_tag_buffer to handle arbitrary repositories
+ tag: allow lookup_tag to handle arbitrary repositories
+ commit: allow lookup_commit to handle arbitrary repositories
+ tree: allow lookup_tree to handle arbitrary repositories
+ blob: allow lookup_blob to handle arbitrary repositories
+ object: allow lookup_object to handle arbitrary repositories
+ object: allow object_as_type to handle arbitrary repositories
+ tag: add repository argument to deref_tag
+ tag: add repository argument to parse_tag_buffer
+ tag: add repository argument to lookup_tag
+ commit: add repository argument to get_cached_commit_buffer
+ commit: add repository argument to set_commit_buffer
+ commit: add repository argument to parse_commit_buffer
+ commit: add repository argument to lookup_commit
+ commit: add repository argument to lookup_commit_reference
+ commit: add repository argument to lookup_commit_reference_gently
+ tree: add repository argument to lookup_tree
+ blob: add repository argument to lookup_blob
+ object: add repository argument to object_as_type
+ object: add repository argument to parse_object_buffer
+ object: add repository argument to lookup_object
+ object: add repository argument to parse_object
+ Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
(this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
lookup_commit_reference() and friends have been updated to find
in-core object for a specific in-core repository instance.
* sg/httpd-test-unflake (2018-07-12) 3 commits
(merged to 'next' on 2018-07-24 at b7df820256)
+ t/lib-httpd: avoid occasional failures when checking access.log
+ t/lib-httpd: add the strip_access_log() helper function
+ t5541: clean up truncating access log
httpd tests saw occasional breakage due to the way its access log
gets inspected by the tests, which has been updated to make them
less flaky.
* tb/grep-only-matching (2018-07-09) 2 commits
(merged to 'next' on 2018-07-24 at 7e878b9d95)
+ grep.c: teach 'git grep --only-matching'
+ grep.c: extract show_line_header()
"git grep" learned the "--only-matching" option.
--------------------------------------------------
[New Topics]
* ab/fsck-transfer-updates (2018-07-27) 10 commits
- fsck: test and document unknown fsck.<msg-id> values
- fsck: add stress tests for fsck.skipList
- fsck: test & document {fetch,receive}.fsck.* config fallback
- fetch: implement fetch.fsck.*
- transfer.fsckObjects tests: untangle confusing setup
- config doc: elaborate on fetch.fsckObjects security
- config doc: elaborate on what transfer.fsckObjects does
- config doc: unify the description of fsck.* and receive.fsck.*
- config doc: don't describe *.fetchObjects twice
- receive.fsck.<msg-id> tests: remove dead code
The test performed at the receiving end of "git push" to prevent
bad objects from entering repository can be customized via
receive.fsck.* configuration variables; we now have gained a
counterpart to do the same on the "git fetch" side, with
fetch.fsck.* configuration variables.
Will merge to 'next'.
* ab/test-must-be-empty (2018-07-30) 1 commit
- tests: make use of the test_must_be_empty function
Test updates.
Will merge to 'next'.
* ab/test-must-be-empty-for-master (2018-07-30) 1 commit
- tests: make use of the test_must_be_empty function
Test updates.
Did anybody spot incorrect conversion in this yet?
* cb/p4-pre-submit-hook (2018-08-01) 1 commit
- git-p4: add the `p4-pre-submit` hook
"git p4 submit" learns to ask its own pre-submit hook if it should
continue with submitting.
Will merge to 'next'.
* es/rebase-i-author-script-fix (2018-07-31) 4 commits
- sequencer: don't die() on bogus user-edited timestamp
- sequencer: fix "rebase -i --root" corrupting author header timestamp
- sequencer: fix "rebase -i --root" corrupting author header timezone
- sequencer: fix "rebase -i --root" corrupting author header
(this branch is used by pw/rebase-i-author-script-fix.)
The "author-script" file "git rebase -i" creates got broken when
we started to move the command away from shell script, which is
getting fixed now.
Will merge to 'next'.
* hn/highlight-sideband-keywords (2018-07-31) 1 commit
- sideband: highlight keywords in remote output
The sideband code learned to optionally paint selected keywords at
the beginning of incoming lines on the receiving end.
* jn/subtree-test-fixes (2018-07-30) 2 commits
- subtree test: simplify preparation of expected results
- subtree test: add missing && to &&-chain
Test fix.
Will merge to 'next'.
* ms/http-proto-doc (2018-07-30) 1 commit
- doc: fix want-capability separator
Doc fix.
Will merge to 'next'.
* nd/pack-objects-threading-doc (2018-07-30) 1 commit
- pack-objects: document about thread synchronization
Doc fix.
Will merge to 'next'.
* sb/indent-heuristic-optim (2018-08-01) 1 commit
- xdiff: reduce indent heuristic overhead
"git diff --indent-heuristic" had a bad corner case performance.
Will merge to 'next'.
* ab/fetch-nego (2018-08-01) 3 commits
- fetch doc: cross-link two new negotiation options
- negotiator: unknown fetch.negotiationAlgorithm should error out
- Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego
Update to a few other topics.
Will merge to 'next'.
* ab/fetch-tags-noclobber (2018-07-31) 10 commits
- fetch: stop clobbering existing tags without --force
- pull doc: fix a long-standing grammar error
- fetch tests: add a test clobbering tag behavior
- fetch tests: correct a comment "remove it" -> "remove them"
- push doc: correct lies about how push refspecs work
- push tests: assert re-pushing annotated tags
- push tests: add more testing for forced tag pushing
- push tests: fix logic error in "push" test assertion
- push tests: remove redundant 'git push' invocation
- fetch tests: change "Tag" test tag to "testTag"
"git fetch" used to apply the same "fast-forward" rule and allow
tags to move without "--force" option, which made little sense,
which has been corrected.
Expecting a reroll.
cf. <xmqq4lgfcn5a.fsf@gitster-ct.c.googlers.com>
cf. <xmqqzhy7b7v9.fsf@gitster-ct.c.googlers.com>
* bp/checkout-new-branch-optim (2018-07-31) 1 commit
- checkout: optimize "git checkout -b <new_branch>"
"git checkout -b newbranch [HEAD]" should not have to do as much as
checking out a commit different from HEAD. An attempt is made to
optimize this special case.
Waiting for review comments to be responded.
cf. <CACsJy8DMEMsDnKZc65K-0EJcm2udXZ7OKY=xoFmX4COM0dSH=g@mail.gmail.com>
* es/mw-to-git-chain-fix (2018-07-31) 1 commit
- mw-to-git/t9360: fix broken &&-chain
Test fix.
Will merge to 'next'.
* jk/merge-subtree-heuristics (2018-08-02) 1 commit
- score_trees(): fix iteration over trees with missing entries
The automatic tree-matching in "git merge -s subtree" was broken 5
years ago and nobody has noticed since then, which is now fixed.
Will merge to 'next'.
* jt/connectivity-check-after-unshallow (2018-08-01) 1 commit
- fetch-pack: unify ref in and out param
Recent update to the transport layer broke ref updates after "git
fetch", which is now fixed.
Will merge to 'next'.
* jt/refspec-dwim-precedence-fix (2018-08-02) 1 commit
- remote: make refspec follow the same disambiguation rule as local refs
"git fetch $there refs/heads/s" ought to fetch the tip of the
branch 's', but when "refs/heads/refs/heads/s", i.e. a branch whose
name is "refs/heads/s" exists at the same time, fetched that one
instead by mistake. This has been corrected to honor the usual
disambiguation rules for abbreviated refnames.
Will merge to 'next'.
* nd/clone-case-smashing-warning (2018-07-31) 1 commit
- clone: report duplicate entries on case-insensitive filesystems
Running "git clone" against a project that contain two files with
pathnames that differ only in cases on a case insensitive
filesystem would result in one of the files lost because the
underlying filesystem is incapable of holding both at the same
time. An attempt is made to detect such a case and warn.
Discussion getting petered out.
Doing this portably and extending it to UTF-8 normalization issue
HFS+ has would be costly.
cf. <20180728095659.GA21450@sigill.intra.peff.net>
cf. <xmqq1sbh7phx.fsf@gitster-ct.c.googlers.com>
* nd/unpack-trees-with-cache-tree (2018-07-31) 4 commits
- unpack-trees: cheaper index update when walking by cache-tree
- unpack-trees: reduce malloc in cache-tree walk
- unpack-trees: optimize walking same trees with cache-tree
- unpack-trees.c: add performance tracing
The unpack_trees() API used in checking out a branch and merging
walks one or more trees along with the index. When the cache-tree
in the index tells us that we are walking a tree whose flattened
contents is known (i.e. matches a span in the index), as linearly
scanning a span in the index is much more efficient than having to
open tree objects recursively and listing their entries, the walk
can be optimized, which is done in this topic.
* rs/remote-mv-leakfix (2018-08-01) 1 commit
- remote: clear string_list after use in mv()
Leakfix.
Will merge to 'next'.
* sb/config-write-fix (2018-08-01) 3 commits
- git-config: document accidental multi-line setting in deprecated syntax
- config: fix case sensitive subsection names on writing
- t1300: document current behavior of setting options
Recent update to "git config" broke updating variable in a
subsection, which has been corrected.
Not quite?
cf. <xmqq4lgc1rbv.fsf@gitster-ct.c.googlers.com>
* sb/range-diff-colors (2018-08-01) 9 commits
- fixup! t3206: add color test for range-diff --dual-color
- diff.c: rewrite emit_line_0 more understandably
- diff.c: compute reverse locally in emit_line_0
- diff: use emit_line_0 once per line
- diff.c: add set_sign to emit_line_0
- diff.c: reorder arguments for emit_line_ws_markup
- diff.c: simplify caller of emit_line_0
- t3206: add color test for range-diff --dual-color
- test_decode_color: understand FAINT and ITALIC
(this branch uses js/range-diff; is tangled with es/format-patch-rangediff.)
* sg/t1404-update-ref-test-timeout (2018-08-01) 1 commit
- t1404: increase core.packedRefsTimeout to avoid occasional test failure
An attempt to unflake a test a bit.
* sg/travis-retrieve-trash-upon-failure (2018-08-01) 1 commit
- travis-ci: include the trash directories of failed tests in the trace log
The Travis CI scripts were taught to ship back the test data from
failed tests.
Will merge to 'next'.
* jt/fetch-follow-fix (2018-08-01) 1 commit
- fetch-pack: unify ref in and out param
"git fetch" sometimes failed to update the remote-tracking refs,
which has been corrected.
Will merge to 'next'.
* ab/sha1dc (2018-08-02) 1 commit
- sha1dc: update from upstream
AIX portability update for SHADC hash, imported from upstream.
Will merge to 'next'.
* es/want-color-fd-defensive (2018-08-02) 1 commit
- color: protect against out-of-bounds array access/assignment
Futureproofing a helper function that can easily misused.
Will merge to 'next'.
* pw/rebase-i-author-script-fix (2018-08-02) 2 commits
- sequencer: fix quoting in write_author_script
- sequencer: handle errors in read_author_ident()
(this branch uses es/rebase-i-author-script-fix.)
Recent "git rebase -i" update started to write bogusly formatted
author-script, with a matching broken reading code. These are
being fixed.
Undecided.
Is it the list consensus to favor this "with extra code, read the
script written by bad writer" approach?
* rs/parse-opt-lithelp (2018-08-02) 6 commits
- parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP
- shortlog: correct option help for -w
- send-pack: specify --force-with-lease argument help explicitly
- pack-objects: specify --index-version argument help explicitly
- difftool: remove angular brackets from argument help
- add, update-index: fix --chmod argument help
The parse-options machinery learned to refrain from enclosing
placeholder string inside a "<bra" and "ket>" pair automatically
without PARSE_OPT_LITERAL_ARGHELP. Existing help text for option
arguments that are not formatted correctly have been identified and
fixed.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ma/wrapped-info (2018-05-28) 2 commits
- usage: prefix all lines in `vreportf()`, not just the first
- usage: extract `prefix_suffix_lines()` from `advise()`
An attempt to help making multi-line messages fed to warning(),
error(), and friends more easily translatable.
Will discard and wait for a cleaned-up rewrite.
cf. <20180529213957.GF7964@sigill.intra.peff.net>
* hn/bisect-first-parent (2018-04-21) 1 commit
- bisect: create 'bisect_flags' parameter in find_bisection()
Preliminary code update to allow passing more flags down the
bisection codepath in the future.
We do not add random code that does not have real users to our
codebase, so let's have it wait until such a real code materializes
before too long.
* av/fsmonitor-updates (2018-01-04) 6 commits
- fsmonitor: use fsmonitor data in `git diff`
- fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: update helper tool, now that flags are filled later
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
- dir.c: update comments to match argument name
Code clean-up on fsmonitor integration, plus optional utilization
of the fsmonitor data in diff-files.
Waiting for an update.
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
* pb/bisect-helper-2 (2018-07-23) 8 commits
- t6030: make various test to pass GETTEXT_POISON tests
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `bisect_reset` shell function in C
Expecting a reroll.
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
I just rebased the topic to a newer base as it did not build
standalone with the base I originally queued the topic on, but
otherwise there is no update to address any of the review comments
in the thread above---we are still waiting for a reroll.
* jk/drop-ancient-curl (2017-08-09) 5 commits
- http: #error on too-old curl
- curl: remove ifdef'd code never used with curl >=7.19.4
- http: drop support for curl < 7.19.4
- http: drop support for curl < 7.16.0
- http: drop support for curl < 7.11.1
Some code in http.c that has bitrot is being removed.
Expecting a reroll.
* mk/use-size-t-in-zlib (2017-08-10) 1 commit
. zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
Needs resurrecting by making sure the fix is good and still applies
(or adjusted to today's codebase).
--------------------------------------------------
[Cooking]
* es/diff-color-moved-fix (2018-07-25) 1 commit
(merged to 'next' on 2018-08-02 at 233bccfbfb)
+ diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
One of the "diff --color-moved" mode "dimmed_zebra" that was named
in an unusual way has been deprecated and replaced by
"dimmed-zebra".
Will merge to 'master'.
* pw/add-p-select (2018-07-26) 4 commits
- add -p: optimize line selection for short hunks
- add -p: allow line selection to be inverted
- add -p: select modified lines correctly
- add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose
individual added/removed lines to be used in the operation, instead
of accepting or rejecting a whole hunk.
Will merge to and cook in 'next'.
I found the feature to be hard to explain, and may result in more
end-user complaints, but let's see.
* mk/http-backend-content-length (2018-07-30) 4 commits
- t5562: avoid non-portable "export FOO=bar" construct
- http-backend: respect CONTENT_LENGTH for receive-pack
- http-backend: respect CONTENT_LENGTH as specified by rfc3875
- http-backend: cleanup writing to child process
The http-backend (used for smart-http transport) used to slurp the
whole input until EOF, without paying attention to CONTENT_LENGTH
that is supplied in the environment and instead expecting the Web
server to close the input stream. This has been fixed.
Will merge to 'next'.
* ds/commit-graph-with-grafts (2018-07-19) 8 commits
(merged to 'next' on 2018-08-02 at 0ee624e329)
+ commit-graph: close_commit_graph before shallow walk
+ commit-graph: not compatible with uninitialized repo
+ commit-graph: not compatible with grafts
+ commit-graph: not compatible with replace objects
+ test-repository: properly init repo
+ commit-graph: update design document
+ refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
+ refs.c: migrate internal ref iteration to pass thru repository argument
The recently introduced commit-graph auxiliary data is incompatible
with mechanisms such as replace & grafts that "breaks" immutable
nature of the object reference relationship. Disable optimizations
based on its use (and updating existing commit-graph) when these
incompatible features are in use in the repository.
Will merge to 'master'.
* jk/core-use-replace-refs (2018-07-18) 3 commits
(merged to 'next' on 2018-08-02 at 90fb6b1056)
+ add core.usereplacerefs config option
+ check_replace_refs: rename to read_replace_refs
+ check_replace_refs: fix outdated comment
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
Will merge to 'master'.
* nd/i18n (2018-07-23) 23 commits
(merged to 'next' on 2018-08-02 at 904a22a5d1)
+ transport-helper.c: mark more strings for translation
+ transport.c: mark more strings for translation
+ sha1-file.c: mark more strings for translation
+ sequencer.c: mark more strings for translation
+ replace-object.c: mark more strings for translation
+ refspec.c: mark more strings for translation
+ refs.c: mark more strings for translation
+ pkt-line.c: mark more strings for translation
+ object.c: mark more strings for translation
+ exec-cmd.c: mark more strings for translation
+ environment.c: mark more strings for translation
+ dir.c: mark more strings for translation
+ convert.c: mark more strings for translation
+ connect.c: mark more strings for translation
+ config.c: mark more strings for translation
+ commit-graph.c: mark more strings for translation
+ builtin/replace.c: mark more strings for translation
+ builtin/pack-objects.c: mark more strings for translation
+ builtin/grep.c: mark strings for translation
+ builtin/config.c: mark more strings for translation
+ archive-zip.c: mark more strings for translation
+ archive-tar.c: mark more strings for translation
+ Update messages in preparation for i18n
Many more strings are prepared for l10n.
Will merge to 'master'.
* sb/histogram-less-memory (2018-07-23) 4 commits
(merged to 'next' on 2018-08-02 at cfb02aa3b5)
+ xdiff/histogram: remove tail recursion
+ xdiff/xhistogram: move index allocation into find_lcs
+ xdiff/xhistogram: factor out memory cleanup into free_index()
+ xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diff
"git diff --histogram" had a bad memory usage pattern, which has
been rearranged to reduce the peak usage.
Will merge to 'master'.
* bb/make-developer-pedantic (2018-07-25) 1 commit
(merged to 'next' on 2018-08-02 at c738a84b7e)
+ Makefile: add a DEVOPTS flag to get pedantic compilation
"make DEVELOPER=1 DEVOPTS=pedantic" allows developers to compile
with -pedantic option, which may catch more problematic program
constructs and potential bugs.
Will merge to 'master'.
* bw/clone-ref-prefixes (2018-07-20) 1 commit
(merged to 'next' on 2018-08-02 at c8ad140ab0)
+ clone: send ref-prefixes when using protocol v2
The wire-protocol v2 relies on the client to send "ref prefixes" to
limit the bandwidth spent on the initial ref advertisement. "git
clone" when learned to speak v2 forgot to do so, which has been
corrected.
Will merge to 'master'.
* bw/fetch-pack-i18n (2018-07-23) 1 commit
(merged to 'next' on 2018-08-02 at df72001755)
+ fetch-pack: mark die strings for translation
i18n updates.
Will merge to 'master'.
* bw/protocol-v2 (2018-07-24) 1 commit
(merged to 'next' on 2018-08-02 at f4076b3e94)
+ pack-protocol: mention and point to docs for protocol v2
Doc update.
Will merge to 'master'.
* ds/reachable (2018-07-20) 18 commits
- commit-reach: use can_all_from_reach
- commit-reach: make can_all_from_reach... linear
- commit-reach: replace ref_newer logic
- test-reach: test commit_contains
- test-reach: test can_all_from_reach_with_flags
- test-reach: test reduce_heads
- test-reach: test get_merge_bases_many
- test-reach: test is_descendant_of
- test-reach: test in_merge_bases
- test-reach: create new test tool for ref_newer
- commit-reach: move can_all_from_reach_with_flags
- upload-pack: generalize commit date cutoff
- upload-pack: refactor ok_to_give_up()
- upload-pack: make reachable() more generic
- commit-reach: move commit_contains from ref-filter
- commit-reach: move ref_newer from remote.c
- commit.h: remove method declarations
- commit-reach: move walk methods from commit.c
The code for computing history reachability has been shuffled,
obtained a bunch of new tests to cover them, and then being
improved.
Will merge to and cook in 'next'.
* en/merge-recursive-skip-fix (2018-07-27) 2 commits
- merge-recursive: preserve skip_worktree bit when necessary
- t3507: add a testcase showing failure with sparse checkout
When the sparse checkout feature is in use, "git cherry-pick" and
other mergy operations lost the skip_worktree bit when a path that
is excluded from checkout requires content level merge, which is
resolved as the same as the HEAD version, without materializing the
merge result in the working tree, which made the path appear as
deleted. This has been corrected by preserving the skip_worktree
bit (and not materializing the file in the working tree).
Will merge to 'next'.
* es/format-patch-interdiff (2018-07-23) 6 commits
- format-patch: allow --interdiff to apply to a lone-patch
- log-tree: show_log: make commentary block delimiting reusable
- interdiff: teach show_interdiff() to indent interdiff
- format-patch: teach --interdiff to respect -v/--reroll-count
- format-patch: add --interdiff option to embed diff in cover letter
- format-patch: allow additional generated content in make_cover_letter()
(this branch is used by es/format-patch-rangediff.)
"git format-patch" learned a new "--interdiff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
Stuck in review?
cf. <CAPig+cSuYUYSPTuKx08wcmQM-G12_-W2T4BS07fA=6grM1b8Gw@mail.gmail.com>
* es/format-patch-rangediff (2018-07-30) 10 commits
- format-patch: allow --range-diff to apply to a lone-patch
- format-patch: add --creation-factor tweak for --range-diff
- format-patch: teach --range-diff to respect -v/--reroll-count
- format-patch: extend --range-diff to accept revision range
- format-patch: add --range-diff option to embed diff in cover letter
- range-diff: relieve callers of low-level configuration burden
- range-diff: publish default creation factor
- range-diff: respect diff_option.file rather than assuming 'stdout'
- Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
- Merge branch 'js/range-diff' into es/format-patch-rangediff
(this branch uses es/format-patch-interdiff and js/range-diff; is tangled with sb/range-diff-colors.)
"git format-patch" learned a new "--range-diff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
Need to wait for the prereq topics to solidify a bit more.
* jk/banned-function (2018-07-26) 5 commits
- banned.h: mark strncpy() as banned
- banned.h: mark sprintf() as banned
- banned.h: mark strcat() as banned
- automatically ban strcpy()
- Merge branch 'sb/blame-color' into jk/banned-function
It is too easy to misuse system API functions such as strcat();
these selected functions are now forbidden in this codebase and
will cause a compilation failure.
Will merge to 'next'.
* jk/size-t (2018-07-24) 6 commits
(merged to 'next' on 2018-08-02 at 6f861e05f0)
+ strbuf_humanise: use unsigned variables
+ pass st.st_size as hint for strbuf_readlink()
+ strbuf_readlink: use ssize_t
+ strbuf: use size_t for length in intermediate variables
+ reencode_string: use size_t for string lengths
+ reencode_string: use st_add/st_mult helpers
Code clean-up to use size_t/ssize_t when they are the right type.
Will merge to 'master'.
* js/t7406-recursive-submodule-update-order-fix (2018-07-23) 1 commit
(merged to 'next' on 2018-08-02 at 217ea36a37)
+ t7406: avoid failures solely due to timing issues
Test fix.
Will merge to 'master'.
* js/vscode (2018-07-30) 9 commits
- vscode: let cSpell work on commit messages, too
- vscode: add a dictionary for cSpell
- vscode: use 8-space tabs, no trailing ws, etc for Git's source code
- vscode: wrap commit messages at column 72 by default
- vscode: only overwrite C/C++ settings
- mingw: define WIN32 explicitly
- cache.h: extract enum declaration from inside a struct declaration
- vscode: hard-code a couple defines
- contrib: add a script to initialize VS Code configuration
Add a script (in contrib/) to help users of VSCode work better with
our codebase.
Will merge to 'next'.
* jt/tag-following-with-proto-v2-fix (2018-07-24) 2 commits
(merged to 'next' on 2018-08-02 at d9eabdea95)
+ fetch: send "refs/tags/" prefix upon CLI refspecs
+ t5702: test fetch with multiple refspecs at a time
The wire-protocol v2 relies on the client to send "ref prefixes" to
limit the bandwidth spent on the initial ref advertisement. "git
fetch $remote branch:branch" that asks tags that point into the
history leading to the "branch" automatically followed sent to
narrow prefix and broke the tag following, which has been fixed.
Will merge to 'master'.
* nd/pack-deltify-regression-fix (2018-07-23) 1 commit
(merged to 'next' on 2018-08-02 at f3b2bf0fef)
+ pack-objects: fix performance issues on packing large deltas
In a recent update in 2.18 era, "git pack-objects" started
producing a larger than necessary packfiles by missing
opportunities to use large deltas.
Will cook in 'next'.
* sb/trailers-docfix (2018-07-20) 1 commit
(merged to 'next' on 2018-08-02 at ba348fafcd)
+ Documentation/git-interpret-trailers: explain possible values
Doc update.
Will merge to 'master'.
* sg/coccicheck-updates (2018-07-23) 5 commits
(merged to 'next' on 2018-08-02 at b5548ff3a9)
+ coccinelle: extract dedicated make target to clean Coccinelle's results
+ coccinelle: put sane filenames into output patches
+ coccinelle: exclude sha1dc source files from static analysis
+ coccinelle: use $(addsuffix) in 'coccicheck' make target
+ coccinelle: mark the 'coccicheck' make target as .PHONY
Update the way we use Coccinelle to find out-of-style code that
need to be modernised.
Will merge to 'master'.
* sg/fast-import-dump-refs-on-checkpoint-fix (2018-07-20) 1 commit
(merged to 'next' on 2018-08-02 at f5c05b5a2c)
+ t9300: wait for background fast-import process to die after killing it
Test update.
Will merge to 'master'.
* sg/travis-cocci-diagnose-failure (2018-07-23) 2 commits
(merged to 'next' on 2018-08-02 at 54808a8778)
+ travis-ci: fail if Coccinelle static analysis found something to transform
+ travis-ci: run Coccinelle static analysis with two parallel jobs
Update the way we run static analysis tool at TravisCI to make it
easier to use its findings.
Will merge to 'master'.
* ab/newhash-is-sha256 (2018-07-26) 2 commits
- doc hash-function-transition: pick SHA-256 as NewHash
- doc hash-function-transition: note the lack of a changelog
Documentation update.
Will merge to 'next'.
* bb/redecl-enum-fix (2018-07-26) 1 commit
- packfile: ensure that enum object_type is defined
Compilation fix.
Will merge to 'next'.
* jh/structured-logging (2018-07-25) 25 commits
- structured-logging: add config data facility
- structured-logging: t0420 tests for interacitve child_summary
- structured-logging: t0420 tests for child process detail events
- structured-logging: add child process classification
- structured-logging: add detail-events for child processes
- structured-logging: add structured logging to remote-curl
- structured-logging: t0420 tests for aux-data
- structured-logging: add aux-data for size of sparse-checkout file
- structured-logging: add aux-data for index size
- structured-logging: add aux-data facility
- structured-logging: t0420 tests for timers
- structured-logging: add timer around preload_index
- structured-logging: add timer around wt-status functions
- structured-logging: add timer around do_write_index
- structured-logging: add timer around do_read_index
- structured-logging: add timer facility
- structured-logging: add detail-event for lazy_init_name_hash
- structured-logging: add detail-event facility
- structured-logging: t0420 basic tests
- structured-logging: set sub_command field for checkout command
- structured-logging: set sub_command field for branch command
- structured-logging: add session-id to log events
- structured-logging: add structured logging framework
- structured-logging: add STRUCTURED_LOGGING=1 to Makefile
- structured-logging: design document
(this branch uses jh/json-writer.)
Will merge to 'next'.
* en/abort-df-conflict-fixes (2018-07-31) 2 commits
- read-cache: fix directory/file conflict handling in read_index_unmerged()
- t1015: demonstrate directory/file conflict recovery failures
"git merge --abort" etc. did not clean things up properly when
there were conflicted entries in certain order that are involved
in D/F conflicts. This has been corrected.
Will merge to 'next'.
* hs/gpgsm (2018-07-20) 7 commits
(merged to 'next' on 2018-08-02 at db28bffe4f)
+ gpg-interface t: extend the existing GPG tests with GPGSM
+ gpg-interface: introduce new signature format "x509" using gpgsm
+ gpg-interface: introduce new config to select per gpg format program
+ gpg-interface: do not hardcode the key string len anymore
+ gpg-interface: introduce an abstraction for multiple gpg formats
+ t/t7510: check the validation of the new config gpg.format
+ gpg-interface: add new config to select how to sign a commit
Teach "git tag -s" etc. a few configuration varaibles (gpg.format
that can be set to "openpgp" or "x509", and gpg.<format>.program
that is used to specify what program to use to deal with the format)
to allow x.509 certs with CMS via "gpgsm" to be used instead of
openpgp via "gnupg".
Will merge to 'master'.
* jn/gc-auto (2018-07-17) 3 commits
- gc: do not return error for prior errors in daemonized mode
- gc: exit with status 128 on failure
- gc: improve handling of errors reading gc.log
"gc --auto" ended up calling exit(-1) upon error, which has been
corrected to use exit(1). Also the error reporting behaviour when
daemonized has been updated to exit with zero status when stopping
due to a previously discovered error (which implies there is no
point running gc to improve the situation); we used to exit with
failure in such a case.
Stuck in review?
cf. <20180717201348.GD26218@sigill.intra.peff.net>
* sb/submodule-update-in-c (2018-07-18) 6 commits
- submodule--helper: introduce new update-module-mode helper
- builtin/submodule--helper: factor out method to update a single submodule
- builtin/submodule--helper: store update_clone information in a struct
- builtin/submodule--helper: factor out submodule updating
- git-submodule.sh: rename unused variables
- git-submodule.sh: align error reporting for update mode to use path
"git submodule update" is getting rewritten piece-by-piece into C.
Will merge to 'next'.
* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
. commit: fix exit code when doing a dry run
. wt-status: teach wt_status_collect about merges in progress
. wt-status: rename commitable to committable
. t7501: add coverage for flags which imply dry runs
"git commit --dry-run" gave a correct exit status even during a
conflict resolution toward a merge, but it did not with the
"--short" option, which has been corrected.
Seems to break 7512, 3404 and 7060 in 'pu'.
* tg/rerere (2018-07-16) 11 commits
- rerere: recalculate conflict ID when unresolved conflict is committed
- rerere: teach rerere to handle nested conflicts
- rerere: return strbuf from handle path
- rerere: factor out handle_conflict function
- rerere: only return whether a path has conflicts or not
- rerere: fix crash when conflict goes unresolved
- rerere: add documentation for conflict normalization
- rerere: mark strings for translation
- rerere: wrap paths in output in sq
- rerere: lowercase error messages
- rerere: unify error messages when read_cache fails
Fixes to "git rerere" corner cases, especially when conflict
markers cannot be parsed in the file.
I am not sure about the "nested" stuff, though.
* jk/ui-color-always-to-auto (2018-07-18) 1 commit
(merged to 'next' on 2018-08-02 at 1a054baf0e)
+ Documentation: fix --color option formatting
Doc formatting fix.
Will merge to 'master'.
* jh/json-writer (2018-07-16) 1 commit
(merged to 'next' on 2018-08-02 at d841450c7d)
+ json_writer: new routines to create JSON data
(this branch is used by jh/structured-logging.)
Preparatory code to later add json output for telemetry data.
Will merge to 'master'.
* ag/rebase-i-in-c (2018-07-31) 20 commits
- rebase -i: move rebase--helper modes to rebase--interactive
- rebase -i: remove git-rebase--interactive.sh
- rebase--interactive2: rewrite the submodes of interactive rebase in C
- rebase -i: implement the main part of interactive rebase as a builtin
- rebase -i: rewrite init_basic_state() in C
- rebase -i: rewrite write_basic_state() in C
- rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C
- rebase -i: implement the logic to initialize $revisions in C
- rebase -i: remove unused modes and functions
- rebase -i: rewrite complete_action() in C
- t3404: todo list with commented-out commands only aborts
- sequencer: change the way skip_unnecessary_picks() returns its result
- sequencer: refactor append_todo_help() to write its message to a buffer
- rebase -i: rewrite checkout_onto() in C
- rebase -i: rewrite setup_reflog_action() in C
- sequencer: add a new function to silence a command, except if it fails
- rebase -i: rewrite the edit-todo functionality in C
- editor: add a function to launch the sequence editor
- rebase -i: rewrite append_todo_help() in C
- sequencer: make two functions and an enum from sequencer.c public
Rewrite of the remaining "rebase -i" machinery in C.
Will merge to 'next'.
* js/range-diff (2018-07-30) 21 commits
- range-diff: use dim/bold cues to improve dual color mode
- range-diff: make --dual-color the default mode
- range-diff: left-pad patch numbers
- completion: support `git range-diff`
- range-diff: populate the man page
- range-diff --dual-color: fix bogus white-space warning
- range-diff: offer to dual-color the diffs
- diff: add an internal option to dual-color diffs of diffs
- color: add the meta color GIT_COLOR_REVERSE
- range-diff: use color for the commit pairs
- range-diff: add tests
- range-diff: do not show "function names" in hunk headers
- range-diff: adjust the output of the commit pairs
- range-diff: suppress the diff headers
- range-diff: indent the diffs just like tbdiff
- range-diff: right-trim commit messages
- range-diff: also show the diff between patches
- range-diff: improve the order of the shown commits
- range-diff: first rudimentary implementation
- Introduce `range-diff` to compare iterations of a topic branch
- linear-assignment: a function to solve least-cost assignment problems
(this branch is used by es/format-patch-rangediff and sb/range-diff-colors.)
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
It seems there will another hopefully the final reroll coming.
cf. <nycvar.QRO.7.76.6.1808011800570.71@tvgsbejvaqbjf.bet>
* lt/date-human (2018-07-09) 1 commit
- Add 'human' date format
A new date format "--date=human" that morphs its output depending
on how far the time is from the current time has been introduced.
"--date=auto" can be used to use this new format when the output is
goint to the pager or to the terminal and otherwise the default
format.
* ot/ref-filter-object-info (2018-07-17) 5 commits
- ref-filter: use oid_object_info() to get object
- ref-filter: merge get_obj and get_object
- ref-filter: initialize eaten variable
- ref-filter: fill empty fields with empty values
- ref-filter: add info_source to valid_atom
A few atoms like %(objecttype) and %(objectsize) in the format
specifier of "for-each-ref --format=<format>" can be filled without
getting the full contents of the object, but just with the object
header. These cases have been optimzied by calling
oid_object_info() API.
Will merge to 'next'.
* pk/rebase-in-c (2018-07-30) 3 commits
- builtin/rebase: support running "git rebase <upstream>"
- rebase: refactor common shell functions into their own file
- rebase: start implementing it as a builtin
Rewrite of the "rebase" machinery in C.
Will merge to 'next'.
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
- branch: make "-l" a synonym for "--list"
Updated plan to repurpose the "-l" option to "git branch".
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
* cc/remote-odb (2018-08-02) 9 commits
- Documentation/config: add odb.<name>.promisorRemote
- t0410: test fetching from many promisor remotes
- Use odb.origin.partialclonefilter instead of core.partialclonefilter
- Use remote_odb_get_direct() and has_remote_odb()
- remote-odb: add remote_odb_reinit()
- remote-odb: implement remote_odb_get_many_direct()
- remote-odb: implement remote_odb_get_direct()
- Add initial remote odb support
- fetch-object: make functions return an error code
Implement lazy fetches of missing objects to complement the
experimental partial clone feature.
I haven't seen much interest in this topic on list. What's the
doneness of this thing?
I do not particularly mind adding code to support a niche feature
as long as it is cleanly made and it is clear that the feature
won't negatively affect those who do not use it, so a review from
that point of view may also be appropriate.
* ds/multi-pack-index (2018-07-20) 23 commits
- midx: clear midx on repack
- packfile: skip loading index if in multi-pack-index
- midx: prevent duplicate packfile loads
- midx: use midx in approximate_object_count
- midx: use existing midx when writing new one
- midx: use midx in abbreviation calculations
- midx: read objects from multi-pack-index
- config: create core.multiPackIndex setting
- midx: write object offsets
- midx: write object id fanout chunk
- midx: write object ids in a chunk
- midx: sort and deduplicate objects from packfiles
- midx: read pack names into array
- multi-pack-index: write pack names in chunk
- multi-pack-index: read packfile list
- packfile: generalize pack directory list
- t5319: expand test data
- multi-pack-index: load into memory
- midx: write header information to lockfile
- multi-pack-index: add 'write' verb
- multi-pack-index: add builtin
- multi-pack-index: add format details
- multi-pack-index: add design document
When there are too many packfiles in a repository (which is not
recommended), looking up an object in these would require
consulting many pack .idx files; a new mechanism to have a single
file that consolidates all of these .idx files is introduced.
Will merge to and cook in 'next'.
--------------------------------------------------
[Discarded]
* am/sequencer-author-script-fix (2018-07-18) 1 commit
. sequencer.c: terminate the last line of author-script properly
The author-script that records the author information created by
the sequencer machinery lacked the closing single quote on the last
entry.
Superseded by another topic.
* jc/push-cas-opt-comment (2018-08-01) 1 commit
. push: comment on a funny unbalanced option help
Code clarification.
Superseded by another topic.
^ permalink raw reply [relevance 4%]
* What's cooking in git.git (Jul 2018, #03; Wed, 25)
@ 2018-07-25 22:13 5% Junio C Hamano
0 siblings, 0 replies; 20+ results
From: Junio C Hamano @ 2018-07-25 22:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Many topics have moved to 'master' and 'next' from 'next' to 'pu'
respectively.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ag/rebase-p (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at c36ebba99b)
+ git-rebase--preserve-merges: fix formatting of todo help message
The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.
* as/sequencer-customizable-comment-char (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at 4163e23f29)
+ sequencer: use configured comment character
Honor core.commentchar when preparing the list of commits to replay
in "rebase -i".
* bb/pedantic (2018-07-09) 8 commits
(merged to 'next' on 2018-07-18 at e9d075e8ed)
+ utf8.c: avoid char overflow
+ string-list.c: avoid conversion from void * to function pointer
+ sequencer.c: avoid empty statements at top level
+ convert.c: replace "\e" escapes with "\033".
+ fixup! refs/refs-internal.h: avoid forward declaration of an enum
+ refs/refs-internal.h: avoid forward declaration of an enum
+ fixup! connect.h: avoid forward declaration of an enum
+ connect.h: avoid forward declaration of an enum
(this branch is used by bb/make-developer-pedantic.)
The codebase has been updated to compile cleanly with -pedantic
option.
* bb/unicode-11-width (2018-07-09) 1 commit
(merged to 'next' on 2018-07-18 at 075648ed37)
+ unicode: update the width tables to Unicode 11
The character display width table has been updated to match the
latest Unicode standard.
* bc/send-email-auto-cte (2018-07-09) 4 commits
(merged to 'next' on 2018-07-18 at d16c2a301a)
+ docs: correct RFC specifying email line length
+ send-email: automatically determine transfer-encoding
+ send-email: accept long lines with suitable transfer encoding
+ send-email: add an auto option for transfer encoding
The content-transfer-encoding of the message "git send-email" sends
out by default was 8bit, which can cause trouble when there is an
overlong line to bust RFC 5322/2822 limit. A new option 'auto' to
automatically switch to quoted-printable when there is such a line
in the payload has been introduced and is made the default.
* bp/log-ref-write-fd-with-strbuf (2018-07-10) 1 commit
(merged to 'next' on 2018-07-18 at 25a3a99528)
+ convert log_ref_write_fd() to use strbuf
Code clean-up.
* bw/ref-in-want (2018-06-28) 8 commits
(merged to 'next' on 2018-07-18 at 7e9f8db37c)
+ fetch-pack: implement ref-in-want
+ fetch-pack: put shallow info in output parameter
+ fetch: refactor to make function args narrower
+ fetch: refactor fetch_refs into two functions
+ fetch: refactor the population of peer ref OIDs
+ upload-pack: test negotiation with changing repository
+ upload-pack: implement ref-in-want
+ test-pkt-line: add unpack-sideband subcommand
(this branch is used by bw/fetch-pack-i18n, jt/connectivity-check-after-unshallow, jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix.)
Protocol v2 has been updated to allow slightly out-of-sync set of
servers to work together to serve a single client, which would be
useful with load-balanced servers that talk smart HTTP transport.
* en/apply-comment-fix (2018-06-28) 1 commit
(merged to 'next' on 2018-07-18 at 31d818f17d)
+ apply: fix grammar error in comment
* en/rebase-consistency (2018-06-27) 9 commits
(merged to 'next' on 2018-07-18 at d597206c79)
+ git-rebase: make --allow-empty-message the default
+ t3401: add directory rename testcases for rebase and am
+ git-rebase.txt: document behavioral differences between modes
+ directory-rename-detection.txt: technical docs on abilities and limitations
+ git-rebase.txt: address confusion between --no-ff vs --force-rebase
+ git-rebase: error out when incompatible options passed
+ t3422: new testcases for checking when incompatible options passed
+ git-rebase.sh: update help messages a bit
+ git-rebase.txt: document incompatible options
"git rebase" behaved slightly differently depending on which one of
the three backends gets used; this has been documented and an
effort to make them more uniform has begun.
* en/t5407-rebase-m-fix (2018-06-28) 1 commit
(merged to 'next' on 2018-07-18 at 459875daeb)
+ t5407: fix test to cover intended arguments
* es/test-lint-one-shot-export (2018-07-16) 5 commits
(merged to 'next' on 2018-07-18 at 26a6124963)
+ t/check-non-portable-shell: detect "FOO=bar shell_func"
+ t/check-non-portable-shell: make error messages more compact
+ t/check-non-portable-shell: stop being so polite
+ t6046/t9833: fix use of "VAR=VAL cmd" with a shell function
+ Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export
(this branch uses jc/t3404-one-shot-export-fix.)
Look for broken use of "VAR=VAL shell_func" in test scripts as part
of test-lint.
* hs/push-cert-check-cleanup (2018-07-11) 2 commits
(merged to 'next' on 2018-07-18 at 1ed25fbd77)
+ gpg-interface: make parse_gpg_output static and remove from interface header
+ builtin/receive-pack: use check_signature from gpg-interface
(this branch is used by hs/gpgsm.)
Code clean-up.
* jc/t3404-one-shot-export-fix (2018-07-12) 1 commit
(merged to 'next' on 2018-07-18 at e15a79dca7)
+ t3404: fix use of "VAR=VAL cmd" with a shell function
(this branch is used by es/test-lint-one-shot-export.)
Correct a broken use of "VAR=VAL shell_func" in a test.
* jk/empty-pick-fix (2018-07-11) 2 commits
(merged to 'next' on 2018-07-18 at 43bfa862f2)
+ sequencer: don't say BUG on bogus input
+ sequencer: handle empty-set cases consistently
Handling of an empty range by "git cherry-pick" was inconsistent
depending on how the range ended up to be empty, which has been
corrected.
* jk/fetch-all-peeled-fix (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at d06c6f1665)
+ t5500: prettify non-commit tag tests
Test modernization.
* jk/for-each-ref-icase (2018-07-03) 3 commits
(merged to 'next' on 2018-07-18 at 4c86d62adb)
+ ref-filter: avoid backend filtering with --ignore-case
+ for-each-ref: consistently pass WM_IGNORECASE flag
+ t6300: add a test for --ignore-case
The "--ignore-case" option of "git for-each-ref" (and its friends)
did not work correctly, which has been fixed.
* jt/connectivity-check-after-unshallow (2018-07-03) 1 commit
(merged to 'next' on 2018-07-18 at 8e7ee889c3)
+ fetch-pack: write shallow, then check connectivity
(this branch is used by jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix; uses bw/ref-in-want; is tangled with bw/fetch-pack-i18n.)
"git fetch" failed to correctly validate the set of objects it
received when making a shallow history deeper, which has been
corrected.
* jt/partial-clone-fsck-connectivity (2018-07-09) 2 commits
(merged to 'next' on 2018-07-18 at 968fd9c9f0)
+ clone: check connectivity even if clone is partial
+ upload-pack: send refs' objects despite "filter"
(this branch is used by jt/tags-to-promised-blobs-fix; uses bw/ref-in-want and jt/connectivity-check-after-unshallow; is tangled with bw/fetch-pack-i18n.)
Partial clone support of "git clone" has been updated to correctly
validate the objects it receives from the other side. The server
side has been corrected to send objects that are directly
requested, even if they may match the filtering criteria (e.g. when
doing a "lazy blob" partial clone).
* kn/userdiff-php (2018-07-06) 2 commits
(merged to 'next' on 2018-07-18 at 9a533dc33a)
+ userdiff: support new keywords in PHP hunk header
+ t4018: add missing test cases for PHP
The userdiff pattern for .php has been updated.
* mh/fast-import-no-diff-delta-empty (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at eb393871f4)
+ fast-import: do not call diff_delta() with empty buffer
"git fast-import" has been updated to avoid attempting to create
delta against a zero-byte-long string, which is pointless.
* mk/merge-in-sparse-checkout (2018-07-11) 1 commit
(merged to 'next' on 2018-07-18 at d2a6d2684d)
+ unpack-trees: do not fail reset because of unmerged skipped entry
"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.
* nd/command-list (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at 77ed2a3914)
+ vcbuild/README: update to accommodate for missing common-cmds.h
Build doc update for Windows.
* rj/submodule-fsck-skip (2018-07-03) 1 commit
(merged to 'next' on 2018-07-11 at 985f88cf7e)
+ fsck: check skiplist for object in fsck_blob()
"fsck.skipList" did not prevent a blob object listed there from
being inspected for is contents (e.g. we recently started to
inspect the contents of ".gitmodules" for certain malicious
patterns), which has been corrected.
* sb/blame-color (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at c319268502)
+ blame: prefer xsnprintf to strcpy for colors
(this branch is used by jk/banned-function.)
Code clean-up.
* sb/submodule-move-head-error-msg (2018-06-25) 1 commit
(merged to 'next' on 2018-07-18 at 9e213ad1aa)
+ submodule.c: report the submodule that an error occurs in
"git checkout --recurse-submodules another-branch" did not report
in which submodule it failed to update the working tree, which
resulted in an unhelpful error message.
* tb/config-default (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at 7994476f6f)
+ builtin/config: work around an unsized array forward declaration
Compilation fix.
* wc/find-commit-with-pattern-on-detached-head (2018-07-12) 1 commit
(merged to 'next' on 2018-07-18 at 334d2420c0)
+ sha1-name.c: for ":/", find detached HEAD commits
"git rev-parse ':/substring'" did not consider the history leading
only to HEAD when looking for a commit with the given substring,
when the HEAD is detached. This has been fixed.
--------------------------------------------------
[New Topics]
* ds/commit-graph-with-grafts (2018-07-19) 8 commits
- commit-graph: close_commit_graph before shallow walk
- commit-graph: not compatible with uninitialized repo
- commit-graph: not compatible with grafts
- commit-graph: not compatible with replace objects
- test-repository: properly init repo
- commit-graph: update design document
- refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
- refs.c: migrate internal ref iteration to pass thru repository argument
(this branch uses ds/commit-graph-fsck, jt/commit-graph-per-object-store and sb/object-store-lookup; is tangled with ds/reachable.)
The recently introduced commit-graph auxiliary data is incompatible
with mechanisms such as replace & grafts that "breaks" immutable
nature of the object reference relationship. Disable optimizations
based on its use (and updating existing commit-graph) when these
incompatible features are in use in the repository.
Will merge to 'next'.
* jk/core-use-replace-refs (2018-07-18) 3 commits
- add core.usereplacerefs config option
- check_replace_refs: rename to read_replace_refs
- check_replace_refs: fix outdated comment
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
Will merge to 'next'.
* nd/i18n (2018-07-23) 23 commits
- transport-helper.c: mark more strings for translation
- transport.c: mark more strings for translation
- sha1-file.c: mark more strings for translation
- sequencer.c: mark more strings for translation
- replace-object.c: mark more strings for translation
- refspec.c: mark more strings for translation
- refs.c: mark more strings for translation
- pkt-line.c: mark more strings for translation
- object.c: mark more strings for translation
- exec-cmd.c: mark more strings for translation
- environment.c: mark more strings for translation
- dir.c: mark more strings for translation
- convert.c: mark more strings for translation
- connect.c: mark more strings for translation
- config.c: mark more strings for translation
- commit-graph.c: mark more strings for translation
- builtin/replace.c: mark more strings for translation
- builtin/pack-objects.c: mark more strings for translation
- builtin/grep.c: mark strings for translation
- builtin/config.c: mark more strings for translation
- archive-zip.c: mark more strings for translation
- archive-tar.c: mark more strings for translation
- Update messages in preparation for i18n
Many more strings are prepared for l10n.
Will merge to 'next'.
* sb/histogram-less-memory (2018-07-23) 4 commits
- xdiff/histogram: remove tail recursion
- xdiff/xhistogram: move index allocation into find_lcs
- xdiff/xhistogram: factor out memory cleanup into free_index()
- xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diff
"git diff --histogram" had a bad memory usage pattern, which has
been rearranged to reduce the peak usage.
Will merge to 'next'.
* bb/make-developer-pedantic (2018-07-25) 1 commit
- Makefile: add a DEVOPTS flag to get pedantic compilation
"make DEVELOPER=1 DEVOPTS=pedantic" allows developers to compile
with -pedantic option, which may catch more problematic program
constructs and potential bugs.
Will merge to 'next' and then to 'master'.
* bw/clone-ref-prefixes (2018-07-20) 1 commit
- clone: send ref-prefixes when using protocol v2
The wire-protocol v2 relies on the client to send "ref prefixes" to
limit the bandwidth spent on the initial ref advertisement. "git
clone" when learned to speak v2 forgot to do so, which has been
corrected.
Will merge to 'next'.
* bw/fetch-pack-i18n (2018-07-23) 1 commit
- fetch-pack: mark die strings for translation
i18n updates.
Will merge to 'next' and then to 'master'.
* bw/protocol-v2 (2018-07-24) 1 commit
- pack-protocol: mention and point to docs for protocol v2
Doc update.
Will merge to 'next' and then to 'master'.
* ds/reachable (2018-07-20) 18 commits
- commit-reach: use can_all_from_reach
- commit-reach: make can_all_from_reach... linear
- commit-reach: replace ref_newer logic
- test-reach: test commit_contains
- test-reach: test can_all_from_reach_with_flags
- test-reach: test reduce_heads
- test-reach: test get_merge_bases_many
- test-reach: test is_descendant_of
- test-reach: test in_merge_bases
- test-reach: create new test tool for ref_newer
- commit-reach: move can_all_from_reach_with_flags
- upload-pack: generalize commit date cutoff
- upload-pack: refactor ok_to_give_up()
- upload-pack: make reachable() more generic
- commit-reach: move commit_contains from ref-filter
- commit-reach: move ref_newer from remote.c
- commit.h: remove method declarations
- commit-reach: move walk methods from commit.c
(this branch uses ds/commit-graph-fsck, jt/commit-graph-per-object-store and sb/object-store-lookup; is tangled with ds/commit-graph-with-grafts.)
The code for computing history reachability has been shuffled,
obtained a bunch of new tests to cover them, and then being
improved.
Stuck in review?
cf. <20180723203500.231932-1-jonathantanmy@google.com>
cf. <20180723204112.233274-1-jonathantanmy@google.com>
cf. <CAGZ79kb7tWV=cmboA+nsChAUaiC+fVVM-GBCuWfsypC+-wyaVg@mail.gmail.com>
* en/merge-recursive-skip-fix (2018-07-23) 2 commits
- merge-recursive: preserve skip_worktree bit when necessary
- t3507: add a testcase showing failure with sparse checkout
When the sparse checkout feature is in use, "git cherry-pick" and
other mergy operations lost the skip_worktree bit when a path that
is excluded from checkout requires content level merge, which is
resolved as the same as the HEAD version, without materializing the
merge result in the working tree, which made the path appear as
deleted. This has been corrected by preserving the skip_worktree
bit (and not materializing the file in the working tree).
Stuck in review?
cf. <75aa297e-4857-d92a-7041-618ff3b0b77a@gmail.com>
* es/format-patch-interdiff (2018-07-23) 6 commits
- format-patch: allow --interdiff to apply to a lone-patch
- log-tree: show_log: make commentary block delimiting reusable
- interdiff: teach show_interdiff() to indent interdiff
- format-patch: teach --interdiff to respect -v/--reroll-count
- format-patch: add --interdiff option to embed diff in cover letter
- format-patch: allow additional generated content in make_cover_letter()
(this branch is used by es/format-patch-rangediff.)
"git format-patch" learned a new "--interdiff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
Stuck in review?
cf. <CAPig+cSuYUYSPTuKx08wcmQM-G12_-W2T4BS07fA=6grM1b8Gw@mail.gmail.com>
* es/format-patch-rangediff (2018-07-25) 10 commits
- format-patch: allow --range-diff to apply to a lone-patch
- format-patch: add --creation-factor tweak for --range-diff
- format-patch: teach --range-diff to respect -v/--reroll-count
- format-patch: extend --range-diff to accept revision range
- format-patch: add --range-diff option to embed diff in cover letter
- range-diff: relieve callers of low-level configuration burden
- range-diff: publish default creation factor
- range-diff: respect diff_option.file rather than assuming 'stdout'
- Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
- Merge branch 'js/range-diff' into es/format-patch-rangediff
(this branch uses es/format-patch-interdiff and js/range-diff.)
"git format-patch" learned a new "--range-diff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
Need to wait for the prereq topics to solidify a bit more.
* jk/banned-function (2018-07-24) 5 commits
- banned.h: mark strncpy() as banned
- banned.h: mark sprintf() as banned
- banned.h: mark strcat() as banned
- automatically ban strcpy()
- Merge branch 'sb/blame-color' into jk/banned-function
It is too easy to misuse system API functions such as strcat();
these selected functions are now forbidden in this codebase and
will cause a compilation failure.
Will merge to 'next'.
* jk/size-t (2018-07-24) 6 commits
- strbuf_humanise: use unsigned variables
- pass st.st_size as hint for strbuf_readlink()
- strbuf_readlink: use ssize_t
- strbuf: use size_t for length in intermediate variables
- reencode_string: use size_t for string lengths
- reencode_string: use st_add/st_mult helpers
Code clean-up to use size_t/ssize_t when they are the right type.
Will merge to 'next'.
* js/t7406-recursive-submodule-update-order-fix (2018-07-23) 1 commit
- t7406: avoid failures solely due to timing issues
Test fix.
Will merge to 'next' and then to 'master'.
* js/vscode (2018-07-23) 9 commits
- vscode: let cSpell work on commit messages, too
- vscode: add a dictionary for cSpell
- vscode: use 8-space tabs, no trailing ws, etc for Git's source code
- vscode: wrap commit messages at column 72 by default
- vscode: only overwrite C/C++ settings
- mingw: define WIN32 explicitly
- cache.h: extract enum declaration from inside a struct declaration
- vscode: hard-code a couple defines
- contrib: add a script to initialize VS Code configuration
Add a script (in contrib/) to help users of VSCode work better with
our codebase.
Stuck in review?
cf. <20180723165719.GA16420@aiede.svl.corp.google.com>
cf. <20180723174108.GA9285@aiede.svl.corp.google.com>
* jt/tag-following-with-proto-v2-fix (2018-07-24) 2 commits
- fetch: send "refs/tags/" prefix upon CLI refspecs
- t5702: test fetch with multiple refspecs at a time
The wire-protocol v2 relies on the client to send "ref prefixes" to
limit the bandwidth spent on the initial ref advertisement. "git
fetch $remote branch:branch" that asks tags that point into the
history leading to the "branch" automatically followed sent to
narrow prefix and broke the tag following, which has been fixed.
Will merge to 'next'.
* nd/pack-deltify-regression-fix (2018-07-23) 1 commit
- pack-objects: fix performance issues on packing large deltas
In a recent update in 2.18 era, "git pack-objects" started
producing a larger than necessary packfiles by missing
opportunities to use large deltas.
Will merge to and cook in 'next'.
* sb/trailers-docfix (2018-07-20) 1 commit
- Documentation/git-interpret-trailers: explain possible values
Doc update.
Will merge to 'next' and then to 'master'.
* sg/coccicheck-updates (2018-07-23) 5 commits
- coccinelle: extract dedicated make target to clean Coccinelle's results
- coccinelle: put sane filenames into output patches
- coccinelle: exclude sha1dc source files from static analysis
- coccinelle: use $(addsuffix) in 'coccicheck' make target
- coccinelle: mark the 'coccicheck' make target as .PHONY
Update the way we use Coccinelle to find out-of-style code that
need to be modernised.
Will merge to 'next'.
* sg/fast-import-dump-refs-on-checkpoint-fix (2018-07-20) 1 commit
- t9300: wait for background fast-import process to die after killing it
Test update.
Will merge to 'next' and then to 'master'.
* sg/travis-cocci-diagnose-failure (2018-07-23) 2 commits
- travis-ci: fail if Coccinelle static analysis found something to transform
- travis-ci: run Coccinelle static analysis with two parallel jobs
Update the way we run static analysis tool at TravisCI to make it
easier to use its findings.
Will merge to 'next' and then to 'master'.
* ab/newhash-is-sha256 (2018-07-25) 1 commit
- doc hash-function-transition: note the lack of a changelog
Documentation update.
Waiting for another attempt for the second part.
* bb/redecl-enum-fix (2018-07-25) 1 commit
- packfile: drop a repeated enum declaration
Compilation fix.
* es/diff-color-move-fix (2018-07-25) 1 commit
- diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
One of the "diff --color-moved" mode "dimmed_zebra" that was named
in an unusual way has been deprecated and replaced by
"dimmed-zebra".
Will merge to 'next' and then to 'master'.
* jh/structured-logging (2018-07-25) 25 commits
- structured-logging: add config data facility
- structured-logging: t0420 tests for interacitve child_summary
- structured-logging: t0420 tests for child process detail events
- structured-logging: add child process classification
- structured-logging: add detail-events for child processes
- structured-logging: add structured logging to remote-curl
- structured-logging: t0420 tests for aux-data
- structured-logging: add aux-data for size of sparse-checkout file
- structured-logging: add aux-data for index size
- structured-logging: add aux-data facility
- structured-logging: t0420 tests for timers
- structured-logging: add timer around preload_index
- structured-logging: add timer around wt-status functions
- structured-logging: add timer around do_write_index
- structured-logging: add timer around do_read_index
- structured-logging: add timer facility
- structured-logging: add detail-event for lazy_init_name_hash
- structured-logging: add detail-event facility
- structured-logging: t0420 basic tests
- structured-logging: set sub_command field for checkout command
- structured-logging: set sub_command field for branch command
- structured-logging: add session-id to log events
- structured-logging: add structured logging framework
- structured-logging: add STRUCTURED_LOGGING=1 to Makefile
- structured-logging: design document
(this branch uses jh/json-writer.)
X-Gah.
--------------------------------------------------
[Stalled]
* pw/add-p-select (2018-03-16) 3 commits
- add -p: optimize line selection for short hunks
- add -p: allow line selection to be inverted
- add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose
individual added/removed lines to be used in the operation, instead
of accepting or rejecting a whole hunk.
Expecting a reroll to reignite the discussion.
cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
* hn/bisect-first-parent (2018-04-21) 1 commit
- bisect: create 'bisect_flags' parameter in find_bisection()
Preliminary code update to allow passing more flags down the
bisection codepath in the future.
We do not add random code that does not have real users to our
codebase, so let's have it wait until such a real code materializes
before too long.
* av/fsmonitor-updates (2018-01-04) 6 commits
- fsmonitor: use fsmonitor data in `git diff`
- fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: update helper tool, now that flags are filled later
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
- dir.c: update comments to match argument name
Code clean-up on fsmonitor integration, plus optional utilization
of the fsmonitor data in diff-files.
Waiting for an update.
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
* pb/bisect-helper-2 (2018-07-23) 8 commits
- t6030: make various test to pass GETTEXT_POISON tests
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `bisect_reset` shell function in C
Expecting a reroll.
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
I just rebased the topic to a newer base as it did not build
standalone with the base I originally queued the topic on, but
otherwise there is no update to address any of the review comments
in the thread above---we are still waiting for a reroll.
* mk/http-backend-content-length (2018-06-11) 3 commits
- http-backend: respect CONTENT_LENGTH for receive-pack
- http-backend: respect CONTENT_LENGTH as specified by rfc3875
- http-backend: cleanup writing to child process
The http-backend (used for smart-http transport) used to slurp the
whole input until EOF, without paying attention to CONTENT_LENGTH
that is supplied in the environment and instead expecting the Web
server to close the input stream. This has been fixed.
* jk/drop-ancient-curl (2017-08-09) 5 commits
- http: #error on too-old curl
- curl: remove ifdef'd code never used with curl >=7.19.4
- http: drop support for curl < 7.19.4
- http: drop support for curl < 7.16.0
- http: drop support for curl < 7.11.1
Some code in http.c that has bitrot is being removed.
Expecting a reroll.
* mk/use-size-t-in-zlib (2017-08-10) 1 commit
. zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
Needs resurrecting by making sure the fix is good and still applies
(or adjusted to today's codebase).
--------------------------------------------------
[Cooking]
* am/sequencer-author-script-fix (2018-07-18) 1 commit
- sequencer.c: terminate the last line of author-script properly
The author-script that records the author information created by
the sequencer machinery lacked the closing single quote on the last
entry.
Fixing this alone may or may not break the reader that may have
been compensating for this bogus writer. I think I saw another fix
to the same source file posted today---if we are fixing, we should
fix them all at the same time to keep the reader and the writer in
sync.
* bc/sequencer-export-work-tree-as-well (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at 0b83ade721)
+ sequencer: pass absolute GIT_WORK_TREE to exec commands
"git rebase" started exporting GIT_DIR environment variable and
exposing it to hook scripts when part of it got rewritten in C.
Instead of matching the old scripted Porcelains' behaviour,
compensate by also exporting GIT_WORK_TREE environment as well to
lessen the damage. This can harm existing hooks that want to
operate on different repository, but the current behaviour is
already broken for them anyway.
Will merge to 'master'.
* bp/test-drop-caches-for-windows (2018-07-12) 1 commit
(merged to 'next' on 2018-07-24 at 257bb336c6)
+ handle lower case drive letters on Windows
A test helper update for Windows.
Will merge to 'master'.
* en/abort-df-conflict-fixes (2018-07-16) 2 commits
- read-cache: fix directory/file conflict handling in read_index_unmerged()
- t1015: demonstrate directory/file conflict recovery failures
"git merge --abort" etc. did not clean things up properly when
there were conflicted entries in certain order that are involved
in D/F conflicts. This has been corrected.
This may have to be rebased on an older maintenance track before
moving forward.
* es/chain-lint-in-subshell (2018-07-17) 10 commits
(merged to 'next' on 2018-07-24 at 9370bbdfaf)
+ t/chainlint: add chainlint "specialized" test cases
+ t/chainlint: add chainlint "complex" test cases
+ t/chainlint: add chainlint "cuddled" test cases
+ t/chainlint: add chainlint "loop" and "conditional" test cases
+ t/chainlint: add chainlint "nested subshell" test cases
+ t/chainlint: add chainlint "one-liner" test cases
+ t/chainlint: add chainlint "whitespace" test cases
+ t/chainlint: add chainlint "basic" test cases
+ t/Makefile: add machinery to check correctness of chainlint.sed
+ t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
(this branch uses es/test-fixes.)
Look for broken "&&" chains that are hidden in subshell, many of
which have been found and corrected.
Will merge to 'master'.
* hs/gpgsm (2018-07-20) 7 commits
- gpg-interface t: extend the existing GPG tests with GPGSM
- gpg-interface: introduce new signature format "x509" using gpgsm
- gpg-interface: introduce new config to select per gpg format program
- gpg-interface: do not hardcode the key string len anymore
- gpg-interface: introduce an abstraction for multiple gpg formats
- t/t7510: check the validation of the new config gpg.format
- gpg-interface: add new config to select how to sign a commit
Teach "git tag -s" etc. a few configuration varaibles (gpg.format
that can be set to "openpgp" or "x509", and gpg.<format>.program
that is used to specify what program to use to deal with the format)
to allow x.509 certs with CMS via "gpgsm" to be used instead of
openpgp via "gnupg".
Will merge to 'next'.
* jk/has-uncommitted-changes-fix (2018-07-11) 1 commit
(merged to 'next' on 2018-07-24 at 2ea14c0afb)
+ has_uncommitted_changes(): fall back to empty tree
"git pull --rebase" on a corrupt HEAD caused a segfault. In
general we substitute an empty tree object when running the in-core
equivalent of the diff-index command, and the codepath has been
corrected to do so as well to fix this issue.
Will merge to 'master'.
* jm/send-email-tls-auth-on-batch (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at fb3e653f44)
+ send-email: fix tls AUTH when sending batch
"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.
Will merge to 'master'.
This is marked to be merged to 'next' already, but I do not mind
getting an updated version with an improved log message before that
happens.
* jn/gc-auto (2018-07-17) 3 commits
- gc: do not return error for prior errors in daemonized mode
- gc: exit with status 128 on failure
- gc: improve handling of errors reading gc.log
"gc --auto" ended up calling exit(-1) upon error, which has been
corrected to use exit(1). Also the error reporting behaviour when
daemonized has been updated to exit with zero status when stopping
due to a previously discovered error (which implies there is no
point running gc to improve the situation); we used to exit with
failure in such a case.
Stuck in review?
cf. <20180717201348.GD26218@sigill.intra.peff.net>
* js/rebase-merge-octopus (2018-07-11) 3 commits
(merged to 'next' on 2018-07-24 at 14ad8699de)
+ rebase --rebase-merges: adjust man page for octopus support
+ rebase --rebase-merges: add support for octopus merges
+ merge: allow reading the merge commit message from a file
"git rebase --rebase-merges" mode now handles octopus merges as
well.
Will merge to 'master'.
* jt/fetch-negotiator-skipping (2018-07-16) 1 commit
(merged to 'next' on 2018-07-24 at 8e25a49405)
+ negotiator/skipping: skip commits during fetch
(this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-nego-tip.)
Add a server-side knob to skip commits in exponential/fibbonacci
stride in an attempt to cover wider swath of history with a smaller
number of iterations, potentially accepting a larger packfile
transfer, instead of going back one commit a time during common
ancestor discovery during the "git fetch" transaction.
Will merge to 'master'.
* jt/tags-to-promised-blobs-fix (2018-07-16) 2 commits
(merged to 'next' on 2018-07-24 at 8d7e78a671)
+ tag: don't warn if target is missing but promised
+ revision: tolerate promised targets of tags
The lazy clone support had a few places where missing but promised
objects were not correctly tolerated, which have been fixed.
Will merge to 'master'.
* sb/submodule-update-in-c (2018-07-18) 6 commits
- submodule--helper: introduce new update-module-mode helper
- builtin/submodule--helper: factor out method to update a single submodule
- builtin/submodule--helper: store update_clone information in a struct
- builtin/submodule--helper: factor out submodule updating
- git-submodule.sh: rename unused variables
- git-submodule.sh: align error reporting for update mode to use path
"git submodule update" is getting rewritten piece-by-piece into C.
It seems to pass its own self-tests standalone, but seems to break
horribly when merged to 'pu'.
* sg/httpd-test-unflake (2018-07-12) 3 commits
(merged to 'next' on 2018-07-24 at b7df820256)
+ t/lib-httpd: avoid occasional failures when checking access.log
+ t/lib-httpd: add the strip_access_log() helper function
+ t5541: clean up truncating access log
httpd tests saw occasional breakage due to the way its access log
gets inspected by the tests, which has been updated to make them
less flaky.
Will merge to 'master'.
* sl/commit-dry-run-with-short-output-fix (2018-07-17) 3 commits
- commit: fix exit code for --short/--porcelain
- wt-status: teach wt_status_collect about merges in progress
- t7501: add merge conflict tests for dry run
"git commit --dry-run" gave a correct exit status even during a
conflict resolution toward a merge, but it did not with the
"--short" option, which has been corrected.
Will merge to 'next'.
* tg/rerere (2018-07-16) 11 commits
- rerere: recalculate conflict ID when unresolved conflict is committed
- rerere: teach rerere to handle nested conflicts
- rerere: return strbuf from handle path
- rerere: factor out handle_conflict function
- rerere: only return whether a path has conflicts or not
- rerere: fix crash when conflict goes unresolved
- rerere: add documentation for conflict normalization
- rerere: mark strings for translation
- rerere: wrap paths in output in sq
- rerere: lowercase error messages
- rerere: unify error messages when read_cache fails
* jk/ui-color-always-to-auto (2018-07-18) 1 commit
- Documentation: fix --color option formatting
Doc formatting fix.
Will merge to 'next' and then to 'master'.
* jh/json-writer (2018-07-16) 1 commit
- json_writer: new routines to create JSON data
(this branch is used by jh/structured-logging.)
Preparatory code to later add json output for telemetry data.
Will merge to 'next'.
* ag/rebase-i-in-c (2018-07-10) 13 commits
- rebase -i: rewrite the rest of init_revisions_and_shortrevisions in C
- rebase -i: implement the logic to initialize the variable $revision in C
- rebase--interactive: remove unused modes and functions
- rebase--interactive: rewrite complete_action() in C
- sequencer: change the way skip_unnecessary_picks() returns its result
- sequencer: refactor append_todo_help() to write its message to a buffer
- rebase -i: rewrite checkout_onto() in C
- rebase -i: rewrite setup_reflog_action() in C
- sequencer: add a new function to silence a command, except if it fails
- rebase-interactive: rewrite the edit-todo functionality in C
- editor: add a function to launch the sequence editor
- rebase--interactive: rewrite append_todo_help() in C
- sequencer: make two functions and an enum from sequencer.c public
Piecemeal rewrite of the remaining "rebase -i" machinery in C.
A reroll (which is rumored to be quite good) exists, but hasn't
been picked up yet.
* sb/object-store-lookup (2018-06-29) 33 commits
(merged to 'next' on 2018-07-24 at dd96e29376)
+ commit.c: allow lookup_commit_reference to handle arbitrary repositories
+ commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories
+ tag.c: allow deref_tag to handle arbitrary repositories
+ object.c: allow parse_object to handle arbitrary repositories
+ object.c: allow parse_object_buffer to handle arbitrary repositories
+ commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
+ commit.c: allow set_commit_buffer to handle arbitrary repositories
+ commit.c: migrate the commit buffer to the parsed object store
+ commit-slabs: remove realloc counter outside of slab struct
+ commit.c: allow parse_commit_buffer to handle arbitrary repositories
+ tag: allow parse_tag_buffer to handle arbitrary repositories
+ tag: allow lookup_tag to handle arbitrary repositories
+ commit: allow lookup_commit to handle arbitrary repositories
+ tree: allow lookup_tree to handle arbitrary repositories
+ blob: allow lookup_blob to handle arbitrary repositories
+ object: allow lookup_object to handle arbitrary repositories
+ object: allow object_as_type to handle arbitrary repositories
+ tag: add repository argument to deref_tag
+ tag: add repository argument to parse_tag_buffer
+ tag: add repository argument to lookup_tag
+ commit: add repository argument to get_cached_commit_buffer
+ commit: add repository argument to set_commit_buffer
+ commit: add repository argument to parse_commit_buffer
+ commit: add repository argument to lookup_commit
+ commit: add repository argument to lookup_commit_reference
+ commit: add repository argument to lookup_commit_reference_gently
+ tree: add repository argument to lookup_tree
+ blob: add repository argument to lookup_blob
+ object: add repository argument to object_as_type
+ object: add repository argument to parse_object_buffer
+ object: add repository argument to lookup_object
+ object: add repository argument to parse_object
+ Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
(this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
lookup_commit_reference() and friends have been updated to find
in-core object for a specific in-core repository instance.
Will merge to 'master'.
* bc/object-id (2018-07-16) 16 commits
(merged to 'next' on 2018-07-24 at 23680778a9)
+ pretty: switch hard-coded constants to the_hash_algo
+ sha1-file: convert constants to uses of the_hash_algo
+ log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
+ diff: switch GIT_SHA1_HEXSZ to use the_hash_algo
+ builtin/merge-recursive: make hash independent
+ builtin/merge: switch to use the_hash_algo
+ builtin/fmt-merge-msg: make hash independent
+ builtin/update-index: simplify parsing of cacheinfo
+ builtin/update-index: convert to using the_hash_algo
+ refs/files-backend: use the_hash_algo for writing refs
+ sha1-name: use the_hash_algo when parsing object names
+ strbuf: allocate space with GIT_MAX_HEXSZ
+ commit: express tree entry constants in terms of the_hash_algo
+ hex: switch to using the_hash_algo
+ tree-walk: replace hard-coded constants with the_hash_algo
+ cache: update object ID functions for the_hash_algo
Conversion from uchar[40] to struct object_id continues.
Will merge to 'master'.
* en/dirty-merge-fixes (2018-07-11) 9 commits
(merged to 'next' on 2018-07-24 at 7b6ca3507c)
+ merge: fix misleading pre-merge check documentation
+ merge-recursive: enforce rule that index matches head before merging
+ t6044: add more testcases with staged changes before a merge is invoked
+ merge-recursive: fix assumption that head tree being merged is HEAD
+ merge-recursive: make sure when we say we abort that we actually abort
+ t6044: add a testcase for index matching head, when head doesn't match HEAD
+ t6044: verify that merges expected to abort actually abort
+ index_has_changes(): avoid assuming operating on the_index
+ read-cache.c: move index_has_changes() from merge.c
The recursive merge strategy did not properly ensure there was no
change between HEAD and the index before performing its operation,
which has been corrected.
Will merge to 'master'.
* en/t6036-merge-recursive-tests (2018-07-11) 6 commits
(merged to 'next' on 2018-07-24 at 75055cb6e1)
+ t6036: add a failed conflict detection case: regular files, different modes
+ t6036: add a failed conflict detection case with conflicting types
+ t6036: add a failed conflict detection case with submodule add/add
+ t6036: add a failed conflict detection case with submodule modify/modify
+ t6036: add a failed conflict detection case with symlink add/add
+ t6036: add a failed conflict detection case with symlink modify/modify
Tests to cover various conflicting cases have been added for
merge-recursive.
Will merge to 'master'.
* en/t6036-recursive-corner-cases (2018-07-12) 2 commits
(merged to 'next' on 2018-07-24 at b7b3514ef4)
+ t6036: fix broken && chain in sub-shell
+ t6036: add lots of detail for directory/file conflicts in recursive case
Tests to cover more D/F conflict cases have been added for
merge-recursive.
Will merge to 'master'.
* en/t6042-insane-merge-rename-testcases (2018-07-03) 3 commits
(merged to 'next' on 2018-07-24 at 65c80f72da)
+ t6042: add testcase covering long chains of rename conflicts
+ t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
+ t6042: add testcase covering rename/add/delete conflict type
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
Will merge to 'master'.
I am not sure if there is a single "correct" answer everybody can
agree on for each of these "insane" cases, though.
* en/t7405-recursive-submodule-conflicts (2018-07-11) 3 commits
(merged to 'next' on 2018-07-24 at 6cb7d02298)
+ t7405: verify 'merge --abort' works after submodule/path conflicts
+ t7405: add a directory/submodule conflict
+ t7405: add a file/submodule conflict
Tests to cover conflict cases that involve submodules have been
added for merge-recursive.
Will merge to 'master'.
* es/test-fixes (2018-07-17) 26 commits
(merged to 'next' on 2018-07-24 at fd6796a3ef)
+ t5608: fix broken &&-chain
+ t9119: fix broken &&-chains
+ t9000-t9999: fix broken &&-chains
+ t7000-t7999: fix broken &&-chains
+ t6000-t6999: fix broken &&-chains
+ t5000-t5999: fix broken &&-chains
+ t4000-t4999: fix broken &&-chains
+ t3030: fix broken &&-chains
+ t3000-t3999: fix broken &&-chains
+ t2000-t2999: fix broken &&-chains
+ t1000-t1999: fix broken &&-chains
+ t0000-t0999: fix broken &&-chains
+ t9814: simplify convoluted check that command correctly errors out
+ t9001: fix broken "invoke hook" test
+ t7810: use test_expect_code() instead of hand-rolled comparison
+ t7400: fix broken "submodule add/reconfigure --force" test
+ t7201: drop pointless "exit 0" at end of subshell
+ t6036: fix broken "merge fails but has appropriate contents" tests
+ t5505: modernize and simplify hard-to-digest test
+ t5406: use write_script() instead of birthing shell script manually
+ t5405: use test_must_fail() instead of checking exit code manually
+ t/lib-submodule-update: fix "absorbing" test
+ t: drop unnecessary terminating semicolon in subshell
+ t: use sane_unset() rather than 'unset' with broken &&-chain
+ t: use test_write_lines() instead of series of 'echo' commands
+ t: use test_might_fail() instead of manipulating exit code manually
(this branch is used by es/chain-lint-in-subshell.)
Test clean-up and corrections.
Will merge to 'master'.
* jk/fsck-gitmodules-gently (2018-07-16) 6 commits
(merged to 'next' on 2018-07-24 at 5b15c800db)
+ fsck: downgrade gitmodulesParse default to "info"
+ fsck: split ".gitmodules too large" error from parse failure
+ fsck: silence stderr when parsing .gitmodules
+ config: add options parameter to git_config_from_mem
+ config: add CONFIG_ERROR_SILENT handler
+ config: turn die_on_error into caller-facing enum
Recent "security fix" to pay attention to contents of ".gitmodules"
while accepting "git push" was a bit overly strict than necessary,
which has been adjusted.
Will merge to 'master'.
* js/range-diff (2018-07-25) 21 commits
- range-diff: use dim/bold cues to improve dual color mode
- range-diff: make --dual-color the default mode
- range-diff: left-pad patch numbers
- completion: support `git range-diff`
- range-diff: populate the man page
- range-diff --dual-color: fix bogus white-space warning
- range-diff: offer to dual-color the diffs
- diff: add an internal option to dual-color diffs of diffs
- color: add the meta color GIT_COLOR_REVERSE
- range-diff: use color for the commit pairs
- range-diff: add tests
- range-diff: do not show "function names" in hunk headers
- range-diff: adjust the output of the commit pairs
- range-diff: suppress the diff headers
- range-diff: indent the diffs just like tbdiff
- range-diff: right-trim commit messages
- range-diff: also show the diff between patches
- range-diff: improve the order of the shown commits
- range-diff: first rudimentary implementation
- Introduce `range-diff` to compare iterations of a topic branch
- linear-assignment: a function to solve least-cost assignment problems
(this branch is used by es/format-patch-rangediff.)
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
Undecided.
Many "The feature is useful" comments without much real review; we
know the feature is great as this mimicks tbdiff already so that is
not news.
I've squashed an obvious documentation fix in before rebasing the
other topic that depends on it. I _think_ we would probably be
better off to _disable_ whitespace-error coloring altogether when
showing diff-of-diff, and get rid of the workaround that only is
applicable to the context lines of the outer diff (unless we first
define how whitespace errors in diff-of-diff should be colored and
implement it correctly, that is, but after seeing these two
attempts, it seems that is harder than it is worth).
* jt/commit-graph-per-object-store (2018-07-17) 7 commits
(merged to 'next' on 2018-07-24 at 090d1a4d59)
+ commit-graph: add repo arg to graph readers
+ commit-graph: store graph in struct object_store
+ commit-graph: add free_commit_graph
+ commit-graph: add missing forward declaration
+ object-store: add missing include
+ commit-graph: refactor preparing commit graph
+ Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store
(this branch is used by ds/commit-graph-with-grafts and ds/reachable; uses ds/commit-graph-fsck and sb/object-store-lookup.)
The singleton commit-graph in-core instance is made per in-core
repository instance.
Will merge to 'master'.
* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
(merged to 'next' on 2018-07-24 at 71c05d27b6)
+ gc --auto: release pack files before auto packing
"git gc --auto" opens file descriptors for the packfiles before
spawning "git repack/prune", which would upset Windows that does
not want a process to work on a file that is open by another
process. The issue has been worked around.
Will merge to 'master'.
* lt/date-human (2018-07-09) 1 commit
- Add 'human' date format
A new date format "--date=human" that morphs its output depending
on how far the time is from the current time has been introduced.
"--date=auto" can be used to use this new format when the output is
goint to the pager or to the terminal and otherwise the default
format.
* ot/ref-filter-object-info (2018-07-17) 5 commits
- ref-filter: use oid_object_info() to get object
- ref-filter: merge get_obj and get_object
- ref-filter: initialize eaten variable
- ref-filter: fill empty fields with empty values
- ref-filter: add info_source to valid_atom
A few atoms like %(objecttype) and %(objectsize) in the format
specifier of "for-each-ref --format=<format>" can be filled without
getting the full contents of the object, but just with the object
header. These cases have been optimzied by calling
oid_object_info() API.
What's the doneness of this one?
* pk/rebase-in-c (2018-07-23) 4 commits
- builtin/rebase: support running "git rebase <upstream>"
- sequencer: refactor the code to detach HEAD to checkout.c
- rebase: refactor common shell functions into their own file
- rebase: start implementing it as a builtin
Piecemeal rewrite of the "rebase" machinery in C.
Expecting a reroll, but it seems that this is getting quite close.
cf. <CAOZc8M8YmLwJOzG-1jyz8ft4W_tJMwNs6kSV8inX1q_zmDW8Sg@mail.gmail.com>
* jt/fetch-nego-tip (2018-07-03) 1 commit
(merged to 'next' on 2018-07-24 at a9e299006d)
+ fetch-pack: support negotiation tip whitelist
(this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-negotiator-skipping.)
"git fetch" learned a new option "--negotiation-tip" to limit the
set of commits it tells the other end as "have", to reduce wasted
bandwidth and cycles, which would be helpful when the receiving
repository has a lot of refs that have little to do with the
history at the remote it is fetching from.
Will merge to 'master'.
* tb/grep-only-matching (2018-07-09) 2 commits
(merged to 'next' on 2018-07-24 at 7e878b9d95)
+ grep.c: teach 'git grep --only-matching'
+ grep.c: extract show_line_header()
"git grep" learned the "--only-matching" option.
Will merge to 'master'.
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
- branch: make "-l" a synonym for "--list"
Updated plan to repurpose the "-l" option to "git branch".
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
* cc/remote-odb (2018-07-16) 9 commits
- Documentation/config: add odb.<name>.promisorRemote
- t0410: test fetching from many promisor remotes
- Use odb.origin.partialclonefilter instead of core.partialclonefilter
- Use remote_odb_get_direct() and has_remote_odb()
- remote-odb: add remote_odb_reinit()
- remote-odb: implement remote_odb_get_many_direct()
- remote-odb: implement remote_odb_get_direct()
- Add initial remote odb support
- fetch-object: make functions return an error code
* ds/multi-pack-index (2018-07-20) 23 commits
- midx: clear midx on repack
- packfile: skip loading index if in multi-pack-index
- midx: prevent duplicate packfile loads
- midx: use midx in approximate_object_count
- midx: use existing midx when writing new one
- midx: use midx in abbreviation calculations
- midx: read objects from multi-pack-index
- config: create core.multiPackIndex setting
- midx: write object offsets
- midx: write object id fanout chunk
- midx: write object ids in a chunk
- midx: sort and deduplicate objects from packfiles
- midx: read pack names into array
- multi-pack-index: write pack names in chunk
- multi-pack-index: read packfile list
- packfile: generalize pack directory list
- t5319: expand test data
- multi-pack-index: load into memory
- midx: write header information to lockfile
- multi-pack-index: add 'write' verb
- multi-pack-index: add builtin
- multi-pack-index: add format details
- multi-pack-index: add design document
When there are too many packfiles in a repository (which is not
recommended), looking up an object in these would require
consulting many pack .idx files; a new mechanism to have a single
file that consolidates all of these .idx files is introduced.
Ready to move to 'next', with some known issues to be followed up?
cf. <xmqqefg8uplg.fsf@gitster-ct.c.googlers.com>
cf. <CAPig+cTU--KrGcv4C_CwBZEuec4dgm_tJqL=CFWKT6vxxR016w@mail.gmail.com>
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
(merged to 'next' on 2018-07-24 at 438efcd6b1)
+ fetch-pack: introduce negotiator API
+ fetch-pack: move common check and marking together
+ fetch-pack: make negotiation-related vars local
+ fetch-pack: use ref adv. to prune "have" sent
+ fetch-pack: directly end negotiation if ACK ready
+ fetch-pack: clear marks before re-marking
+ fetch-pack: split up everything_local()
(this branch is used by jt/fetch-nego-tip and jt/fetch-negotiator-skipping.)
Code restructuring and a small fix to transport protocol v2 during
fetching.
Will merge to 'master'.
* is/parsing-line-range (2018-06-15) 2 commits
(merged to 'next' on 2018-07-24 at a06b453f32)
+ log: prevent error if line range ends past end of file
+ blame: prevent error if range ends past end of file
Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
take has been tweaked.
Will merge to 'master'.
* ab/checkout-default-remote (2018-06-11) 8 commits
(merged to 'next' on 2018-07-24 at 6ef645f485)
+ checkout & worktree: introduce checkout.defaultRemote
+ checkout: add advice for ambiguous "checkout <branch>"
+ builtin/checkout.c: use "ret" variable for return
+ checkout: pass the "num_matches" up to callers
+ checkout.c: change "unique" member to "num_matches"
+ checkout.c: introduce an *_INIT macro
+ checkout.h: wrap the arguments to unique_tracking_name()
+ checkout tests: index should be clean after dwim checkout
"git checkout" and "git worktree add" learned to honor
checkout.defaultRemote when auto-vivifying a local branch out of a
remote tracking branch in a repository with multiple remotes that
have tracking branches that share the same names.
Will merge to 'master'.
* ds/commit-graph-fsck (2018-07-16) 23 commits
(merged to 'next' on 2018-07-24 at 6a802adc7a)
+ coccinelle: update commit.cocci
+ commit-graph: update design document
+ gc: automatically write commit-graph files
+ commit-graph: add '--reachable' option
+ commit-graph: use string-list API for input
+ fsck: verify commit-graph
+ commit-graph: verify contents match checksum
+ commit-graph: test for corrupted octopus edge
+ commit-graph: verify commit date
+ commit-graph: verify generation number
+ commit-graph: verify parent list
+ commit-graph: verify root tree OIDs
+ commit-graph: verify objects exist
+ commit-graph: verify corrupt OID fanout and lookup
+ commit-graph: verify required chunks are present
+ commit-graph: verify catches corrupt signature
+ commit-graph: add 'verify' subcommand
+ commit-graph: load a root tree from specific graph
+ commit: force commit to parse from object database
+ commit-graph: parse commit from chosen graph
+ commit-graph: fix GRAPH_MIN_SIZE
+ commit-graph: UNLEAK before die()
+ t5318-commit-graph.sh: use core.commitGraph
(this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
"git fsck" learns to make sure the optional commit-graph file is in
a sane state.
Will merge to 'master'.
* ma/wrapped-info (2018-05-28) 2 commits
- usage: prefix all lines in `vreportf()`, not just the first
- usage: extract `prefix_suffix_lines()` from `advise()`
An attempt to help making multi-line messages fed to warning(),
error(), and friends more easily translatable.
Will discard and wait for a cleaned-up rewrite.
cf. <20180529213957.GF7964@sigill.intra.peff.net>
* jm/cache-entry-from-mem-pool (2018-07-03) 8 commits
(merged to 'next' on 2018-07-24 at 9be51a88dc)
+ block alloc: add validations around cache_entry lifecyle
+ block alloc: allocate cache entries from mem_pool
+ mem-pool: fill out functionality
+ mem-pool: add life cycle management functions
+ mem-pool: only search head block for available space
+ block alloc: add lifecycle APIs for cache_entry structs
+ read-cache: teach make_cache_entry to take object_id
+ read-cache: teach refresh_cache_entry to take istate
For a large tree, the index needs to hold many cache entries
allocated on heap. These cache entries are now allocated out of a
dedicated memory pool to amortize malloc(3) overhead.
Will merge to 'master'.
This makes each cache-entry larger by either 4 or 8 bytes, which is
a bit sad, though.
* sb/diff-color-move-more (2018-07-19) 10 commits
(merged to 'next' on 2018-07-24 at 89c893cab2)
+ diff.c: offer config option to control ws handling in move detection
+ diff.c: add white space mode to move detection that allows indent changes
+ diff.c: factor advance_or_nullify out of mark_color_as_moved
+ diff.c: decouple white space treatment from move detection algorithm
+ diff.c: add a blocks mode for moved code detection
+ diff.c: adjust hash function signature to match hashmap expectation
+ diff.c: do not pass diff options as keydata to hashmap
+ t4015: avoid git as a pipe input
+ xdiff/xdiffi.c: remove unneeded function declarations
+ xdiff/xdiff.h: remove unused flags
"git diff --color-moved" feature has further been tweaked.
Will merge to 'master'.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jul 2018, #02; Wed, 18)
@ 2018-07-18 22:03 5% Junio C Hamano
0 siblings, 0 replies; 20+ results
From: Junio C Hamano @ 2018-07-18 22:03 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Many topics have moved to 'master' and 'next' from 'next' to 'pu'
respectively. As I needed to re-resolve semantic merge conflicts
while reordering some topics (i.e. some that were merged earlier in
'pu' are left in 'pu' while another topic that had interactions with
them and required evil merge to resolve semantic conflicts
leapfrogged to 'next'---the semantic conflict resolution then need
to happen at a different merge than done earlier in 'pu' while
rebuilding today's integration), I didn't have enough time to spend
on new topics posted to the list in the past few days.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ao/config-from-gitmodules (2018-06-26) 6 commits
(merged to 'next' on 2018-07-11 at 5d88dc6fb7)
+ submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
+ submodule-config: pass repository as argument to config_from_gitmodules
+ submodule-config: make 'config_from_gitmodules' private
+ submodule-config: add helper to get 'update-clone' config from .gitmodules
+ submodule-config: add helper function to get 'fetch' config from .gitmodules
+ config: move config_from_gitmodules to submodule-config.c
Tighten the API to make it harder to misuse in-tree .gitmodules
file, even though it shares the same syntax with configuration
files, to read random configuration items from it.
* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit
(merged to 'next' on 2018-06-29 at da6f49d292)
+ docs: link to gitsubmodules
Docfix.
* bw/protocol-v2 (2018-06-22) 1 commit
(merged to 'next' on 2018-06-29 at 78090cc343)
+ protocol-v2 doc: put HTTP headers after request
Doc fix.
* dj/runtime-prefix (2018-06-26) 1 commit
(merged to 'next' on 2018-07-11 at 27d99fef94)
+ Makefile: tweak sed invocation
POSIX portability fix in Makefile to fix a glitch introduced a few
releases ago.
* ds/commit-graph (2018-06-28) 1 commit
(merged to 'next' on 2018-07-11 at d579f733ed)
+ commit-graph: fix documentation inconsistencies
Docfix.
* ds/ewah-cleanup (2018-06-21) 10 commits
(merged to 'next' on 2018-06-28 at 9cd7c0d54a)
+ ewah: delete unused 'rlwit_discharge_empty()'
+ ewah: drop ewah_serialize_native function
+ ewah: drop ewah_deserialize function
+ ewah_io: delete unused 'ewah_serialize()'
+ ewah_bitmap: delete unused 'ewah_or()'
+ ewah_bitmap: delete unused 'ewah_not()'
+ ewah_bitmap: delete unused 'ewah_and_not()'
+ ewah_bitmap: delete unused 'ewah_and()'
+ ewah/bitmap.c: delete unused 'bitmap_each_bit()'
+ ewah/bitmap.c: delete unused 'bitmap_clear()'
Originally merged to 'next' on 2018-06-22
Remove unused function definitions and declarations from ewah
bitmap subsystem.
* en/merge-recursive-cleanup (2018-06-12) 6 commits
(merged to 'next' on 2018-06-28 at 1a3646eb7d)
+ merge-recursive: add pointer about unduly complex looking code
+ merge-recursive: rename conflict_rename_*() family of functions
+ merge-recursive: clarify the rename_dir/RENAME_DIR meaning
+ merge-recursive: align labels with their respective code blocks
+ merge-recursive: fix numerous argument alignment issues
+ merge-recursive: fix miscellaneous grammar error in comment
Originally merged to 'next' on 2018-06-19
Code cleanup.
* en/rebase-i-microfixes (2018-06-27) 3 commits
(merged to 'next' on 2018-07-11 at d913ca0f77)
+ git-rebase--merge: modernize "git-$cmd" to "git $cmd"
+ Fix use of strategy options with interactive rebases
+ t3418: add testcase showing problems with rebase -i and strategy options
Will merge to 'master'.
* jk/branch-l-0-deprecation (2018-06-22) 3 commits
(merged to 'next' on 2018-06-29 at fac676dfb9)
+ branch: deprecate "-l" option
+ t: switch "branch -l" to "branch --create-reflog"
+ t3200: unset core.logallrefupdates when testing reflog creation
(this branch is used by jk/branch-l-1-repurpose.)
The "-l" option in "git branch -l" is an unfortunate short-hand for
"--create-reflog", but many users, both old and new, somehow expect
it to be something else, perhaps "--list". This step warns when "-l"
is used as a short-hand for "--create-reflog" and warns about the
future repurposing of the it when it is used.
* js/enhanced-version-info (2018-06-29) 1 commit
(merged to 'next' on 2018-07-11 at 815b2ea2bc)
+ Makefile: fix the "built from commit" code
Build fix.
* js/rebase-recreate-merge (2018-06-27) 1 commit
(merged to 'next' on 2018-07-11 at eb8f33aaef)
+ rebase: fix documentation formatting
Docfix.
* jt/remove-pack-bitmap-global (2018-06-21) 2 commits
(merged to 'next' on 2018-06-29 at 852857b04e)
+ pack-bitmap: add free function
+ pack-bitmap: remove bitmap_git global variable
The effort to move globals to per-repository in-core structure
continues.
* ld/p423 (2018-06-19) 6 commits
(merged to 'next' on 2018-06-29 at af76acb664)
+ git-p4: python3: fix octal constants
+ git-p4: python3: use print() function
+ git-p4: python3: basestring workaround
+ git-p4: python3: remove backticks
+ git-p4: python3: replace dict.has_key(k) with "k in dict"
+ git-p4: python3: replace <> with !=
Code preparation to make "git p4" closer to be usable with Python 3.
* mb/filter-branch-optim (2018-06-26) 1 commit
(merged to 'next' on 2018-07-11 at e43a0136c2)
+ filter-branch: skip commits present on --state-branch
"git filter-branch" when used with the "--state-branch" option
still attempted to rewrite the commits whose filtered result is
known from the previous attempt (which is recorded on the state
branch); the command has been corrected not to waste cycles doing
so.
* ms/core-icase-doc (2018-06-28) 1 commit
(merged to 'next' on 2018-07-11 at 8f0d71c32d)
+ Documentation: declare "core.ignoreCase" as internal variable
Clarify that setting core.ignoreCase to deviate from reality would
not turn a case-incapable filesystem into a case-capable one.
* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit
(merged to 'next' on 2018-06-29 at 538337be74)
+ sequencer: do not squash 'reword' commits when we hit conflicts
Bugfix for "rebase -i" corner case regression.
* sb/mailmap (2018-06-29) 1 commit
(merged to 'next' on 2018-07-11 at d9dc53e374)
+ .mailmap: merge different spellings of names
Will merge to 'master'.
* sb/object-store-grafts (2018-05-18) 19 commits
(merged to 'next' on 2018-06-28 at 02f70d6302)
+ commit: allow lookup_commit_graft to handle arbitrary repositories
+ commit: allow prepare_commit_graft to handle arbitrary repositories
+ shallow: migrate shallow information into the object parser
+ path.c: migrate global git_path_* to take a repository argument
+ cache: convert get_graft_file to handle arbitrary repositories
+ commit: convert read_graft_file to handle arbitrary repositories
+ commit: convert register_commit_graft to handle arbitrary repositories
+ commit: convert commit_graft_pos() to handle arbitrary repositories
+ shallow: add repository argument to is_repository_shallow
+ shallow: add repository argument to check_shallow_file_for_update
+ shallow: add repository argument to register_shallow
+ shallow: add repository argument to set_alternate_shallow_file
+ commit: add repository argument to lookup_commit_graft
+ commit: add repository argument to prepare_commit_graft
+ commit: add repository argument to read_graft_file
+ commit: add repository argument to register_commit_graft
+ commit: add repository argument to commit_graft_pos
+ object: move grafts to object parser
+ object-store: move object access functions to object-store.h
(this branch is used by jt/commit-graph-per-object-store and sb/object-store-lookup.)
Originally merged to 'next' on 2018-06-22
The conversion to pass "the_repository" and then "a_repository"
throughout the object access API continues.
* sb/submodule-core-worktree (2018-06-19) 3 commits
(merged to 'next' on 2018-06-28 at 96e1a8dbd1)
+ submodule deinit: unset core.worktree
+ submodule: ensure core.worktree is set after update
+ submodule: unset core.worktree if no working tree is present
Originally merged to 'next' on 2018-06-22
"git submodule" did not correctly adjust core.worktree setting that
indicates whether/where a submodule repository has its associated
working tree across various state transitions, which has been
corrected.
* tb/grep-column (2018-06-22) 7 commits
(merged to 'next' on 2018-06-29 at 25dc70426e)
+ contrib/git-jump/git-jump: jump to exact location
+ grep.c: add configuration variables to show matched option
+ builtin/grep.c: add '--column' option to 'git-grep(1)'
+ grep.c: display column number of first match
+ grep.[ch]: extend grep_opt to allow showing matched column
+ grep.c: expose {,inverted} match column in match_line()
+ Documentation/config.txt: camel-case lineNumber for consistency
(this branch is used by tb/grep-only-matching.)
"git grep" learned the "--column" option that gives not just the
line number but the column number of the hit.
* tz/exclude-doc-smallfixes (2018-06-27) 2 commits
(merged to 'next' on 2018-07-11 at 5134f1ca72)
+ dir.c: fix typos in core.excludesfile comment
+ gitignore.txt: clarify default core.excludesfile path
Doc updates.
* vs/typofixes (2018-06-22) 1 commit
(merged to 'next' on 2018-06-29 at 665c8db2f7)
+ Documentation: spelling and grammar fixes
Doc fix.
* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit
(merged to 'next' on 2018-06-29 at 0dffc46ce2)
+ format-patch: clear UNINTERESTING flag before prepare_bases
Recently added "--base" option to "git format-patch" command did
not correctly generate prereq patch ids.
--------------------------------------------------
[New Topics]
* am/sequencer-author-script-fix (2018-07-18) 1 commit
- sequencer.c: terminate the last line of author-script properly
The author-script that records the author information created by
the sequencer machinery lacked the closing single quote on the last
entry.
Fixing this alone may or may not break the reader that may have
been compensating for this bogus writer. I think I saw another fix
to the same source file posted today---if we are fixing, we should
fix them all at the same time to keep the reader and the writer in
sync.
* bc/sequencer-export-work-tree-as-well (2018-07-16) 1 commit
- sequencer: pass absolute GIT_WORK_TREE to exec commands
"git rebase" started exporting GIT_DIR environment variable and
exposing it to hook scripts when part of it got rewritten in C.
Instead of matching the old scripted Porcelains' behaviour,
compensate by also exporting GIT_WORK_TREE environment as well to
lessen the damage. This can harm existing hooks that want to
operate on different repository, but the current behaviour is
already broken for them anyway.
Will merge to 'next'.
* bp/test-drop-caches-for-windows (2018-07-12) 1 commit
- handle lower case drive letters on Windows
A test helper update for Windows.
Will merge to 'next'.
* en/abort-df-conflict-fixes (2018-07-16) 2 commits
- read-cache: fix directory/file conflict handling in read_index_unmerged()
- t1015: demonstrate directory/file conflict recovery failures
"git merge --abort" etc. did not clean things up properly when
there were conflicted entries in certain order that are involved
in D/F conflicts. This has been corrected.
This may have to be rebased on an older maintenance track before
moving forward.
* es/chain-lint-in-subshell (2018-07-17) 10 commits
- t/chainlint: add chainlint "specialized" test cases
- t/chainlint: add chainlint "complex" test cases
- t/chainlint: add chainlint "cuddled" test cases
- t/chainlint: add chainlint "loop" and "conditional" test cases
- t/chainlint: add chainlint "nested subshell" test cases
- t/chainlint: add chainlint "one-liner" test cases
- t/chainlint: add chainlint "whitespace" test cases
- t/chainlint: add chainlint "basic" test cases
- t/Makefile: add machinery to check correctness of chainlint.sed
- t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
(this branch uses es/test-fixes.)
Look for broken "&&" chains that are hidden in subshell, many of
which have been found and corrected.
Will merge to 'next'.
* es/test-lint-one-shot-export (2018-07-16) 5 commits
(merged to 'next' on 2018-07-18 at 26a6124963)
+ t/check-non-portable-shell: detect "FOO=bar shell_func"
+ t/check-non-portable-shell: make error messages more compact
+ t/check-non-portable-shell: stop being so polite
+ t6046/t9833: fix use of "VAR=VAL cmd" with a shell function
+ Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export
(this branch uses jc/t3404-one-shot-export-fix.)
Look for broken use of "vAR=VAL shell_func" in test scripts as part
of test-lint.
Will merge to 'master'.
* hs/gpgsm (2018-07-18) 7 commits
- gpg-interface t: extend the existing GPG tests with GPGSM
- gpg-interface: introduce new signature format "x509" using gpgsm
- gpg-interface: introduce new config to select per gpg format program
- gpg-interface: do not hardcode the key string len anymore
- gpg-interface: introduce an abstraction for multiple gpg formats
- t/t7510: check the validation of the new config gpg.format
- gpg-interface: add new config to select how to sign a commit
(this branch uses hs/push-cert-check-cleanup.)
Teach "git tag -s" etc. a few configuration varaibles (gpg.format
that can be set to "openpgp" or "x509", and gpg.<format>.program
that is used to specify what program to use to deal with the format)
to allow x.509 certs with CMS via "gpgsm" to be used instead of
openpgp via "gnupg".
I think this round is mostly ready, except for a minor nit in the
last step. I do not mind merging this to 'next' and leave fixing
of the test to a later clean-up.
* jc/t3404-one-shot-export-fix (2018-07-12) 1 commit
(merged to 'next' on 2018-07-18 at e15a79dca7)
+ t3404: fix use of "VAR=VAL cmd" with a shell function
(this branch is used by es/test-lint-one-shot-export.)
Correct a broken use of "VAR=VAL shell_func" in a test.
Will merge to 'master'.
* jk/has-uncommitted-changes-fix (2018-07-11) 1 commit
- has_uncommitted_changes(): fall back to empty tree
"git pull --rebase" on a corrupt HEAD caused a segfault. In
general we substitute an empty tree object when running the in-core
equivalent of the diff-index command, and the codepath has been
corrected to do so as well to fix this issue.
Will merge to 'next'.
* jm/send-email-tls-auth-on-batch (2018-07-16) 1 commit
- send-email: fix tls AUTH when sending batch
"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.
Will merge to 'next'.
This is marked to be merged to 'next' already, but I do not mind
getting an updated version with an improved log message before that
happens.
* jn/gc-auto (2018-07-17) 3 commits
- gc: do not return error for prior errors in daemonized mode
- gc: exit with status 128 on failure
- gc: improve handling of errors reading gc.log
"gc --auto" ended up calling exit(-1) upon error, which has been
corrected to use exit(1). Also the error reporting behaviour when
daemonized has been updated to exit with zero status when stopping
due to a previously discovered error (which implies there is no
point running gc to improve the situation); we used to exit with
failure in such a case.
Under discussion.
cf. <20180717201348.GD26218@sigill.intra.peff.net>
* js/rebase-merge-octopus (2018-07-11) 3 commits
- rebase --rebase-merges: adjust man page for octopus support
- rebase --rebase-merges: add support for octopus merges
- merge: allow reading the merge commit message from a file
"git rebase --rebase-merges" mode now handles octopus merges as
well.
Will merge to 'next'.
* jt/fetch-negotiator-skipping (2018-07-16) 1 commit
- negotiator/skipping: skip commits during fetch
(this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-nego-tip.)
Add a server-side knob to skip commits in exponential/fibbonacci
stride in an attempt to cover wider swath of history with a smaller
number of iterations, potentially accepting a larger packfile
transfer, instead of going back one commit a time during common
ancestor discovery during the "git fetch" transaction.
Will merge to 'next'.
* jt/tags-to-promised-blobs-fix (2018-07-16) 2 commits
- tag: don't warn if target is missing but promised
- revision: tolerate promised targets of tags
(this branch uses bw/ref-in-want, jt/connectivity-check-after-unshallow and jt/partial-clone-fsck-connectivity.)
The lazy clone support had a few places where missing but promised
objects were not correctly tolerated, which have been fixed.
Will merge to 'next'.
* nd/command-list (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at 77ed2a3914)
+ vcbuild/README: update to accommodate for missing common-cmds.h
Build doc update for Windows.
Will merge to 'master'.
* sb/blame-color (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at c319268502)
+ blame: prefer xsnprintf to strcpy for colors
Code clean-up.
Will merge to 'master'.
* sb/submodule-update-in-c (2018-07-17) 6 commits
- submodule--helper: introduce new update-module-mode helper
- builtin/submodule--helper: factor out method to update a single submodule
- builtin/submodule--helper: store update_clone information in a struct
- builtin/submodule--helper: factor out submodule updating
- git-submodule.sh: rename unused variables
- git-submodule.sh: align error reporting for update mode to use path
"git submodule update" is getting rewritten piece-by-piece into C.
It seems to pass its own self-tests standalone, but seems to break
horribly when merged to 'pu'.
* sg/httpd-test-unflake (2018-07-12) 3 commits
- t/lib-httpd: avoid occasional failures when checking access.log
- t/lib-httpd: add the strip_access_log() helper function
- t5541: clean up truncating access log
httpd tests saw occasional breakage due to the way its access log
gets inspected by the tests, which has been updated to make them
less flaky.
Will merge to 'next'.
* sl/commit-dry-run-with-short-output-fix (2018-07-17) 3 commits
- commit: fix exit code for --short/--porcelain
- wt-status: teach wt_status_collect about merges in progress
- t7501: add merge conflict tests for dry run
Under discussion.
cf. <xmqqpnzlpyux.fsf@gitster-ct.c.googlers.com>
* tg/rerere (2018-07-16) 11 commits
- rerere: recalculate conflict ID when unresolved conflict is committed
- rerere: teach rerere to handle nested conflicts
- rerere: return strbuf from handle path
- rerere: factor out handle_conflict function
- rerere: only return whether a path has conflicts or not
- rerere: fix crash when conflict goes unresolved
- rerere: add documentation for conflict normalization
- rerere: mark strings for translation
- rerere: wrap paths in output in sq
- rerere: lowercase error messages
- rerere: unify error messages when read_cache fails
* wc/find-commit-with-pattern-on-detached-head (2018-07-12) 1 commit
(merged to 'next' on 2018-07-18 at 334d2420c0)
+ sha1-name.c: for ":/", find detached HEAD commits
"git rev-parse ':/substring'" did not consider the history leading
only to HEAD when looking for a commit with the given substring,
when the HEAD is detached. This has been fixed.
Will merge to 'master'.
* jk/ui-color-always-to-auto (2018-07-18) 1 commit
- Documentation: fix --color option formatting
--------------------------------------------------
[Stalled]
* pw/add-p-select (2018-03-16) 3 commits
- add -p: optimize line selection for short hunks
- add -p: allow line selection to be inverted
- add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose
individual added/removed lines to be used in the operation, instead
of accepting or rejecting a whole hunk.
Expecting a reroll to reignite the discussion.
cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
* hn/bisect-first-parent (2018-04-21) 1 commit
- bisect: create 'bisect_flags' parameter in find_bisection()
Preliminary code update to allow passing more flags down the
bisection codepath in the future.
We do not add random code that does not have real users to our
codebase, so let's have it wait until such a real code materializes
before too long.
* av/fsmonitor-updates (2018-01-04) 6 commits
- fsmonitor: use fsmonitor data in `git diff`
- fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: update helper tool, now that flags are filled later
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
- dir.c: update comments to match argument name
Code clean-up on fsmonitor integration, plus optional utilization
of the fsmonitor data in diff-files.
Waiting for an update.
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
* pb/bisect-helper-2 (2018-06-13) 8 commits
- t6030: make various test to pass GETTEXT_POISON tests
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `bisect_reset` shell function in C
Expecting a reroll.
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
I just rebased the topic to a newer base as it did not build
standalone with the base I originally queued the topic on, but
otherwise there is no update to address any of the review comments
in the thread above---we are still waiting for a reroll.
* mk/http-backend-content-length (2018-06-11) 3 commits
- http-backend: respect CONTENT_LENGTH for receive-pack
- http-backend: respect CONTENT_LENGTH as specified by rfc3875
- http-backend: cleanup writing to child process
The http-backend (used for smart-http transport) used to slurp the
whole input until EOF, without paying attention to CONTENT_LENGTH
that is supplied in the environment and instead expecting the Web
server to close the input stream. This has been fixed.
* jk/drop-ancient-curl (2017-08-09) 5 commits
- http: #error on too-old curl
- curl: remove ifdef'd code never used with curl >=7.19.4
- http: drop support for curl < 7.19.4
- http: drop support for curl < 7.16.0
- http: drop support for curl < 7.11.1
Some code in http.c that has bitrot is being removed.
Expecting a reroll.
* mk/use-size-t-in-zlib (2017-08-10) 1 commit
. zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
Needs resurrecting by making sure the fix is good and still applies
(or adjusted to today's codebase).
--------------------------------------------------
[Cooking]
* jh/json-writer (2018-07-16) 1 commit
- json_writer: new routines to create JSON data
Preparatory code to later add json output for telemetry data.
A series on top that adds telemetry data exists but hasn't been
picked up yet.
* ag/rebase-i-in-c (2018-07-10) 13 commits
- rebase -i: rewrite the rest of init_revisions_and_shortrevisions in C
- rebase -i: implement the logic to initialize the variable $revision in C
- rebase--interactive: remove unused modes and functions
- rebase--interactive: rewrite complete_action() in C
- sequencer: change the way skip_unnecessary_picks() returns its result
- sequencer: refactor append_todo_help() to write its message to a buffer
- rebase -i: rewrite checkout_onto() in C
- rebase -i: rewrite setup_reflog_action() in C
- sequencer: add a new function to silence a command, except if it fails
- rebase-interactive: rewrite the edit-todo functionality in C
- editor: add a function to launch the sequence editor
- rebase--interactive: rewrite append_todo_help() in C
- sequencer: make two functions and an enum from sequencer.c public
Piecemeal rewrite of the remaining "rebase -i" machinery in C.
Expecting a reroll.
The early parts of the series seem solidifying; perhaps with a
reroll or two, they become 'next' material?
* en/apply-comment-fix (2018-06-28) 1 commit
(merged to 'next' on 2018-07-18 at 31d818f17d)
+ apply: fix grammar error in comment
Will merge to 'master'.
* en/t5407-rebase-m-fix (2018-06-28) 1 commit
(merged to 'next' on 2018-07-18 at 459875daeb)
+ t5407: fix test to cover intended arguments
Will merge to 'master'.
* sb/object-store-lookup (2018-06-29) 33 commits
- commit.c: allow lookup_commit_reference to handle arbitrary repositories
- commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories
- tag.c: allow deref_tag to handle arbitrary repositories
- object.c: allow parse_object to handle arbitrary repositories
- object.c: allow parse_object_buffer to handle arbitrary repositories
- commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
- commit.c: allow set_commit_buffer to handle arbitrary repositories
- commit.c: migrate the commit buffer to the parsed object store
- commit-slabs: remove realloc counter outside of slab struct
- commit.c: allow parse_commit_buffer to handle arbitrary repositories
- tag: allow parse_tag_buffer to handle arbitrary repositories
- tag: allow lookup_tag to handle arbitrary repositories
- commit: allow lookup_commit to handle arbitrary repositories
- tree: allow lookup_tree to handle arbitrary repositories
- blob: allow lookup_blob to handle arbitrary repositories
- object: allow lookup_object to handle arbitrary repositories
- object: allow object_as_type to handle arbitrary repositories
- tag: add repository argument to deref_tag
- tag: add repository argument to parse_tag_buffer
- tag: add repository argument to lookup_tag
- commit: add repository argument to get_cached_commit_buffer
- commit: add repository argument to set_commit_buffer
- commit: add repository argument to parse_commit_buffer
- commit: add repository argument to lookup_commit
- commit: add repository argument to lookup_commit_reference
- commit: add repository argument to lookup_commit_reference_gently
- tree: add repository argument to lookup_tree
- blob: add repository argument to lookup_blob
- object: add repository argument to object_as_type
- object: add repository argument to parse_object_buffer
- object: add repository argument to lookup_object
- object: add repository argument to parse_object
- Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
(this branch is used by jt/commit-graph-per-object-store.)
lookup_commit_reference() and friends have been updated to find
in-core object for a specific in-core repository instance.
Will merge to 'next'.
* ag/rebase-p (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at c36ebba99b)
+ git-rebase--preserve-merges: fix formatting of todo help message
The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.
Will merge to 'master'.
* bb/pedantic (2018-07-09) 8 commits
(merged to 'next' on 2018-07-18 at e9d075e8ed)
+ utf8.c: avoid char overflow
+ string-list.c: avoid conversion from void * to function pointer
+ sequencer.c: avoid empty statements at top level
+ convert.c: replace "\e" escapes with "\033".
+ fixup! refs/refs-internal.h: avoid forward declaration of an enum
+ refs/refs-internal.h: avoid forward declaration of an enum
+ fixup! connect.h: avoid forward declaration of an enum
+ connect.h: avoid forward declaration of an enum
The codebase has been updated to compile cleanly with -pedantic
option.
Will merge to 'master'.
* bb/unicode-11-width (2018-07-09) 1 commit
(merged to 'next' on 2018-07-18 at 075648ed37)
+ unicode: update the width tables to Unicode 11
The character display width table has been updated to match the
latest Unicode standard.
Will merge to 'master'.
* bc/object-id (2018-07-16) 16 commits
- pretty: switch hard-coded constants to the_hash_algo
- sha1-file: convert constants to uses of the_hash_algo
- log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
- diff: switch GIT_SHA1_HEXSZ to use the_hash_algo
- builtin/merge-recursive: make hash independent
- builtin/merge: switch to use the_hash_algo
- builtin/fmt-merge-msg: make hash independent
- builtin/update-index: simplify parsing of cacheinfo
- builtin/update-index: convert to using the_hash_algo
- refs/files-backend: use the_hash_algo for writing refs
- sha1-name: use the_hash_algo when parsing object names
- strbuf: allocate space with GIT_MAX_HEXSZ
- commit: express tree entry constants in terms of the_hash_algo
- hex: switch to using the_hash_algo
- tree-walk: replace hard-coded constants with the_hash_algo
- cache: update object ID functions for the_hash_algo
Conversion from uchar[40] to struct object_id continues.
Will merge to 'next'.
* bc/send-email-auto-cte (2018-07-09) 4 commits
(merged to 'next' on 2018-07-18 at d16c2a301a)
+ docs: correct RFC specifying email line length
+ send-email: automatically determine transfer-encoding
+ send-email: accept long lines with suitable transfer encoding
+ send-email: add an auto option for transfer encoding
The content-transfer-encoding of the message "git send-email" sends
out by default was 8bit, which can cause trouble when there is an
overlong line to bust RFC 5322/2822 limit. A new option 'auto' to
automatically switch to quoted-printable when there is such a line
in the payload has been introduced and is made the default.
Will merge to 'master'.
* en/dirty-merge-fixes (2018-07-11) 9 commits
- merge: fix misleading pre-merge check documentation
- merge-recursive: enforce rule that index matches head before merging
- t6044: add more testcases with staged changes before a merge is invoked
- merge-recursive: fix assumption that head tree being merged is HEAD
- merge-recursive: make sure when we say we abort that we actually abort
- t6044: add a testcase for index matching head, when head doesn't match HEAD
- t6044: verify that merges expected to abort actually abort
- index_has_changes(): avoid assuming operating on the_index
- read-cache.c: move index_has_changes() from merge.c
The recursive merge strategy did not properly ensure there was no
change between HEAD and the index before performing its operation,
which has been corrected.
Will merge to 'next'.
* en/t6036-merge-recursive-tests (2018-07-11) 6 commits
- t6036: add a failed conflict detection case: regular files, different modes
- t6036: add a failed conflict detection case with conflicting types
- t6036: add a failed conflict detection case with submodule add/add
- t6036: add a failed conflict detection case with submodule modify/modify
- t6036: add a failed conflict detection case with symlink add/add
- t6036: add a failed conflict detection case with symlink modify/modify
Tests to cover various conflicting cases have been added for
merge-recursive.
Will merge to 'next'.
* en/t6036-recursive-corner-cases (2018-07-12) 2 commits
- t6036: fix broken && chain in sub-shell
- t6036: add lots of detail for directory/file conflicts in recursive case
Tests to cover more D/F conflict cases have been added for
merge-recursive.
Will merge to 'next'.
* en/t6042-insane-merge-rename-testcases (2018-07-03) 3 commits
- t6042: add testcase covering long chains of rename conflicts
- t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
- t6042: add testcase covering rename/add/delete conflict type
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
Will merge to 'next'.
I am not sure if there is a single "correct" answer everybody can
agree on for each of these "insane" cases, though.
* en/t7405-recursive-submodule-conflicts (2018-07-11) 3 commits
- t7405: verify 'merge --abort' works after submodule/path conflicts
- t7405: add a directory/submodule conflict
- t7405: add a file/submodule conflict
Tests to cover conflict cases that involve submodules have been
added for merge-recursive.
Will merge to 'next'.
* es/test-fixes (2018-07-17) 26 commits
- t5608: fix broken &&-chain
- t9119: fix broken &&-chains
- t9000-t9999: fix broken &&-chains
- t7000-t7999: fix broken &&-chains
- t6000-t6999: fix broken &&-chains
- t5000-t5999: fix broken &&-chains
- t4000-t4999: fix broken &&-chains
- t3030: fix broken &&-chains
- t3000-t3999: fix broken &&-chains
- t2000-t2999: fix broken &&-chains
- t1000-t1999: fix broken &&-chains
- t0000-t0999: fix broken &&-chains
- t9814: simplify convoluted check that command correctly errors out
- t9001: fix broken "invoke hook" test
- t7810: use test_expect_code() instead of hand-rolled comparison
- t7400: fix broken "submodule add/reconfigure --force" test
- t7201: drop pointless "exit 0" at end of subshell
- t6036: fix broken "merge fails but has appropriate contents" tests
- t5505: modernize and simplify hard-to-digest test
- t5406: use write_script() instead of birthing shell script manually
- t5405: use test_must_fail() instead of checking exit code manually
- t/lib-submodule-update: fix "absorbing" test
- t: drop unnecessary terminating semicolon in subshell
- t: use sane_unset() rather than 'unset' with broken &&-chain
- t: use test_write_lines() instead of series of 'echo' commands
- t: use test_might_fail() instead of manipulating exit code manually
(this branch is used by es/chain-lint-in-subshell.)
Test clean-up and corrections.
Will merge to 'next'.
* jk/empty-pick-fix (2018-07-11) 2 commits
(merged to 'next' on 2018-07-18 at 43bfa862f2)
+ sequencer: don't say BUG on bogus input
+ sequencer: handle empty-set cases consistently
Handling of an empty range by "git cherry-pick" was inconsistent
depending on how the range ended up to be empty, which has been
corrected.
Will merge to 'master'.
* jk/fetch-all-peeled-fix (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at d06c6f1665)
+ t5500: prettify non-commit tag tests
Test modernization.
Will merge to 'master'.
* jk/for-each-ref-icase (2018-07-03) 3 commits
(merged to 'next' on 2018-07-18 at 4c86d62adb)
+ ref-filter: avoid backend filtering with --ignore-case
+ for-each-ref: consistently pass WM_IGNORECASE flag
+ t6300: add a test for --ignore-case
The "--ignore-case" option of "git for-each-ref" (and its friends)
did not work correctly, which has been fixed.
Will merge to 'master'.
* jk/fsck-gitmodules-gently (2018-07-16) 6 commits
- fsck: downgrade gitmodulesParse default to "info"
- fsck: split ".gitmodules too large" error from parse failure
- fsck: silence stderr when parsing .gitmodules
- config: add options parameter to git_config_from_mem
- config: add CONFIG_ERROR_SILENT handler
- config: turn die_on_error into caller-facing enum
Recent "security fix" to pay attention to contents of ".gitmodules"
while accepting "git push" was a bit overly strict than necessary,
which has been adjusted.
Will merge to 'next'.
* js/range-diff (2018-07-09) 20 commits
- range-diff: make --dual-color the default mode
- range-diff: left-pad patch numbers
- completion: support `git range-diff`
- range-diff: add a man page
- range-diff --dual-color: work around bogus white-space warning
- range-diff: offer to dual-color the diffs
- diff: add an internal option to dual-color diffs of diffs
- color: add the meta color GIT_COLOR_REVERSE
- range-diff: use color for the commit pairs
- range-diff: add tests
- range-diff: do not show "function names" in hunk headers
- range-diff: adjust the output of the commit pairs
- range-diff: suppress the diff headers
- range-diff: indent the diffs just like tbdiff
- range-diff: right-trim commit messages
- range-diff: also show the diff between patches
- range-diff: improve the order of the shown commits
- range-diff: first rudimentary implementation
- Introduce `range-diff` to compare iterations of a topic branch
- linear-assignment: a function to solve least-cost assignment problems
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
Supersedes js/branch-diff topic that added a similar command under
a different name.
* jt/commit-graph-per-object-store (2018-07-17) 7 commits
- commit-graph: add repo arg to graph readers
- commit-graph: store graph in struct object_store
- commit-graph: add free_commit_graph
- commit-graph: add missing forward declaration
- object-store: add missing include
- commit-graph: refactor preparing commit graph
- Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store
(this branch uses ds/commit-graph-fsck and sb/object-store-lookup.)
The singleton commit-graph in-core instance is made per in-core
repository instance.
Will merge to 'next'.
* jt/partial-clone-fsck-connectivity (2018-07-09) 2 commits
(merged to 'next' on 2018-07-18 at 968fd9c9f0)
+ clone: check connectivity even if clone is partial
+ upload-pack: send refs' objects despite "filter"
(this branch is used by jt/tags-to-promised-blobs-fix; uses bw/ref-in-want and jt/connectivity-check-after-unshallow.)
Partial clone support of "git clone" has been updated to correctly
validate the objects it receives from the other side. The server
side has been corrected to send objects that are directly
requested, even if they may match the filtering criteria (e.g. when
doing a "lazy blob" partial clone).
Will merge to 'master'.
* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
- gc --auto: release pack files before auto packing
"git gc --auto" opens file descriptors for the packfiles before
spawning "git repack/prune", which would upset Windows that does
not want a process to work on a file that is open by another
process. The issue has been worked around.
Will merge to 'next'.
* kn/userdiff-php (2018-07-06) 2 commits
(merged to 'next' on 2018-07-18 at 9a533dc33a)
+ userdiff: support new keywords in PHP hunk header
+ t4018: add missing test cases for PHP
The userdiff pattern for .php has been updated.
Will merge to 'master'.
* lt/date-human (2018-07-09) 1 commit
- Add 'human' date format
* mh/fast-import-no-diff-delta-empty (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at eb393871f4)
+ fast-import: do not call diff_delta() with empty buffer
"git fast-import" has been updated to avoid attempting to create
delta against a zero-byte-long string, which is pointless.
Will merge to 'master'.
* ot/ref-filter-object-info (2018-07-17) 5 commits
- ref-filter: use oid_object_info() to get object
- ref-filter: merge get_obj and get_object
- ref-filter: initialize eaten variable
- ref-filter: fill empty fields with empty values
- ref-filter: add info_source to valid_atom
A few atoms like %(objecttype) and %(objectsize) in the format
specifier of "for-each-ref --format=<format>" can be filled without
getting the full contents of the object, but just with the object
header. These cases have been optimzied by calling
oid_object_info() API.
What's the doneness of this one?
* pk/rebase-in-c (2018-07-09) 4 commits
- builtin/rebase: support running "git rebase <upstream>"
- sequencer: refactor the code to detach HEAD to checkout.c
- rebase: refactor common shell functions into their own file
- rebase: start implementing it as a builtin
Piecemeal rewrite of the "rebase" machinery in C.
Expecting a reroll, but it seems that this is getting quite close.
cf. <CAOZc8M8YmLwJOzG-1jyz8ft4W_tJMwNs6kSV8inX1q_zmDW8Sg@mail.gmail.com>
* tb/config-default (2018-07-06) 1 commit
(merged to 'next' on 2018-07-18 at 7994476f6f)
+ builtin/config: work around an unsized array forward declaration
Compilation fix.
Will merge to 'master'.
* bp/log-ref-write-fd-with-strbuf (2018-07-10) 1 commit
(merged to 'next' on 2018-07-18 at 25a3a99528)
+ convert log_ref_write_fd() to use strbuf
Code clean-up.
Will merge to 'master'.
* hs/push-cert-check-cleanup (2018-07-11) 2 commits
(merged to 'next' on 2018-07-18 at 1ed25fbd77)
+ gpg-interface: make parse_gpg_output static and remove from interface header
+ builtin/receive-pack: use check_signature from gpg-interface
(this branch is used by hs/gpgsm.)
Code clean-up.
Will merge to 'master'.
* mk/merge-in-sparse-checkout (2018-07-11) 1 commit
(merged to 'next' on 2018-07-18 at d2a6d2684d)
+ unpack-trees: do not fail reset because of unmerged skipped entry
"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.
Will merge to 'master'.
* as/sequencer-customizable-comment-char (2018-07-16) 1 commit
(merged to 'next' on 2018-07-18 at 4163e23f29)
+ sequencer: use configured comment character
Honor core.commentchar when preparing the list of commits to replay
in "rebase -i".
Will merge to 'master'.
* jt/connectivity-check-after-unshallow (2018-07-03) 1 commit
(merged to 'next' on 2018-07-18 at 8e7ee889c3)
+ fetch-pack: write shallow, then check connectivity
(this branch is used by jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix; uses bw/ref-in-want.)
"git fetch" failed to correctly validate the set of objects it
received when making a shallow history deeper, which has been
corrected.
Will merge to 'master'.
* jt/fetch-nego-tip (2018-07-03) 1 commit
- fetch-pack: support negotiation tip whitelist
(this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-negotiator-skipping.)
"git fetch" learned a new option "--negotiation-tip" to limit the
set of commits it tells the other end as "have", to reduce wasted
bandwidth and cycles, which would be helpful when the receiving
repository has a lot of refs that have little to do with the
history at the remote it is fetching from.
Will merge to 'next'.
* rj/submodule-fsck-skip (2018-07-03) 1 commit
(merged to 'next' on 2018-07-11 at 985f88cf7e)
+ fsck: check skiplist for object in fsck_blob()
"fsck.skipList" did not prevent a blob object listed there from
being inspected for is contents (e.g. we recently started to
inspect the contents of ".gitmodules" for certain malicious
patterns), which has been corrected.
Will merge to 'master'.
* tb/grep-only-matching (2018-07-09) 2 commits
- grep.c: teach 'git grep --only-matching'
- grep.c: extract show_line_header()
"git grep" learned the "--only-matching" option.
Will merge to 'next'.
* bw/ref-in-want (2018-06-28) 8 commits
(merged to 'next' on 2018-07-18 at 7e9f8db37c)
+ fetch-pack: implement ref-in-want
+ fetch-pack: put shallow info in output parameter
+ fetch: refactor to make function args narrower
+ fetch: refactor fetch_refs into two functions
+ fetch: refactor the population of peer ref OIDs
+ upload-pack: test negotiation with changing repository
+ upload-pack: implement ref-in-want
+ test-pkt-line: add unpack-sideband subcommand
(this branch is used by jt/connectivity-check-after-unshallow, jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix.)
Protocol v2 has been updated to allow slightly out-of-sync set of
servers to work together to serve a single client, which would be
useful with load-balanced servers that talk smart HTTP transport.
Will merge to 'master'.
* en/rebase-consistency (2018-06-27) 9 commits
(merged to 'next' on 2018-07-18 at d597206c79)
+ git-rebase: make --allow-empty-message the default
+ t3401: add directory rename testcases for rebase and am
+ git-rebase.txt: document behavioral differences between modes
+ directory-rename-detection.txt: technical docs on abilities and limitations
+ git-rebase.txt: address confusion between --no-ff vs --force-rebase
+ git-rebase: error out when incompatible options passed
+ t3422: new testcases for checking when incompatible options passed
+ git-rebase.sh: update help messages a bit
+ git-rebase.txt: document incompatible options
"git rebase" behaved slightly differently depending on which one of
the three backends gets used; this has been documented and an
effort to make them more uniform has begun.
Will merge to 'master'.
* sb/submodule-move-head-error-msg (2018-06-25) 1 commit
(merged to 'next' on 2018-07-18 at 9e213ad1aa)
+ submodule.c: report the submodule that an error occurs in
Will merge to 'master'.
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
- branch: make "-l" a synonym for "--list"
Updated plan to repurpose the "-l" option to "git branch".
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
* cc/remote-odb (2018-07-16) 9 commits
- Documentation/config: add odb.<name>.promisorRemote
- t0410: test fetching from many promisor remotes
- Use odb.origin.partialclonefilter instead of core.partialclonefilter
- Use remote_odb_get_direct() and has_remote_odb()
- remote-odb: add remote_odb_reinit()
- remote-odb: implement remote_odb_get_many_direct()
- remote-odb: implement remote_odb_get_direct()
- Add initial remote odb support
- fetch-object: make functions return an error code
* ds/multi-pack-index (2018-07-12) 23 commits
- midx: clear midx on repack
- packfile: skip loading index if in multi-pack-index
- midx: prevent duplicate packfile loads
- midx: use midx in approximate_object_count
- midx: use existing midx when writing new one
- midx: use midx in abbreviation calculations
- midx: read objects from multi-pack-index
- config: create core.multiPackIndex setting
- midx: write object offsets
- midx: write object id fanout chunk
- midx: write object ids in a chunk
- midx: sort and deduplicate objects from packfiles
- midx: read pack names into array
- multi-pack-index: write pack names in chunk
- multi-pack-index: read packfile list
- packfile: generalize pack directory list
- t5319: expand test data
- multi-pack-index: load into memory
- midx: write header information to lockfile
- multi-pack-index: add 'write' verb
- multi-pack-index: add builtin
- multi-pack-index: add format details
- multi-pack-index: add design document
When there are too many packfiles in a repository (which is not
recommended), looking up an object in these would require
consulting many pack .idx files; a new mechanism to have a single
file that consolidates all of these .idx files is introduced.
What's the doneness of this one? I vaguely recall that there was
an objection against the concept as a whole (i.e. there is a way
with less damage to gain the same object-abbrev performance); has
it (and if anything else, they) been resolved in satisfactory
fashion?
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
- fetch-pack: introduce negotiator API
- fetch-pack: move common check and marking together
- fetch-pack: make negotiation-related vars local
- fetch-pack: use ref adv. to prune "have" sent
- fetch-pack: directly end negotiation if ACK ready
- fetch-pack: clear marks before re-marking
- fetch-pack: split up everything_local()
(this branch is used by jt/fetch-nego-tip and jt/fetch-negotiator-skipping.)
Code restructuring and a small fix to transport protocol v2 during
fetching.
Will merge to 'next'.
* is/parsing-line-range (2018-06-15) 2 commits
- log: prevent error if line range ends past end of file
- blame: prevent error if range ends past end of file
Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
take has been tweaked.
Will merge to 'next'.
* ab/checkout-default-remote (2018-06-11) 8 commits
- checkout & worktree: introduce checkout.defaultRemote
- checkout: add advice for ambiguous "checkout <branch>"
- builtin/checkout.c: use "ret" variable for return
- checkout: pass the "num_matches" up to callers
- checkout.c: change "unique" member to "num_matches"
- checkout.c: introduce an *_INIT macro
- checkout.h: wrap the arguments to unique_tracking_name()
- checkout tests: index should be clean after dwim checkout
"git checkout" and "git worktree add" learned to honor
checkout.defaultRemote when auto-vivifying a local branch out of a
remote tracking branch in a repository with multiple remotes that
have tracking branches that share the same names.
Will merge to 'next'.
* ds/commit-graph-fsck (2018-07-16) 23 commits
- coccinelle: update commit.cocci
- commit-graph: update design document
- gc: automatically write commit-graph files
- commit-graph: add '--reachable' option
- commit-graph: use string-list API for input
- fsck: verify commit-graph
- commit-graph: verify contents match checksum
- commit-graph: test for corrupted octopus edge
- commit-graph: verify commit date
- commit-graph: verify generation number
- commit-graph: verify parent list
- commit-graph: verify root tree OIDs
- commit-graph: verify objects exist
- commit-graph: verify corrupt OID fanout and lookup
- commit-graph: verify required chunks are present
- commit-graph: verify catches corrupt signature
- commit-graph: add 'verify' subcommand
- commit-graph: load a root tree from specific graph
- commit: force commit to parse from object database
- commit-graph: parse commit from chosen graph
- commit-graph: fix GRAPH_MIN_SIZE
- commit-graph: UNLEAK before die()
- t5318-commit-graph.sh: use core.commitGraph
(this branch is used by jt/commit-graph-per-object-store.)
"git fsck" learns to make sure the optional commit-graph file is in
a sane state.
Will merge to 'next'.
* ma/wrapped-info (2018-05-28) 2 commits
- usage: prefix all lines in `vreportf()`, not just the first
- usage: extract `prefix_suffix_lines()` from `advise()`
An attempt to help making multi-line messages fed to warning(),
error(), and friends more easily translatable.
Will discard and wait for a cleaned-up rewrite.
cf. <20180529213957.GF7964@sigill.intra.peff.net>
* jm/cache-entry-from-mem-pool (2018-07-03) 8 commits
- block alloc: add validations around cache_entry lifecyle
- block alloc: allocate cache entries from mem_pool
- mem-pool: fill out functionality
- mem-pool: add life cycle management functions
- mem-pool: only search head block for available space
- block alloc: add lifecycle APIs for cache_entry structs
- read-cache: teach make_cache_entry to take object_id
- read-cache: teach refresh_cache_entry to take istate
For a large tree, the index needs to hold many cache entries
allocated on heap. These cache entries are now allocated out of a
dedicated memory pool to amortize malloc(3) overhead.
Will merge to 'next'.
This makes each cache-entry larger by either 4 or 8 bytes, which is
a bit sad, though.
* sb/diff-color-move-more (2018-07-17) 9 commits
- diff.c: add white space mode to move detection that allows indent changes
- diff.c: factor advance_or_nullify out of mark_color_as_moved
- diff.c: decouple white space treatment from move detection algorithm
- diff.c: add a blocks mode for moved code detection
- diff.c: adjust hash function signature to match hashmap expectation
- diff.c: do not pass diff options as keydata to hashmap
- t4015: avoid git as a pipe input
- xdiff/xdiffi.c: remove unneeded function declarations
- xdiff/xdiff.h: remove unused flags
"git diff --color-moved" feature has further been tweaked.
Will merge to 'next'.
--------------------------------------------------
[Discarded]
* ag/rebase-i-append-todo-help (2018-06-14) 2 commits
. rebase--interactive: rewrite append_todo_help() in C
. Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
(this branch is used by ag/rebase-i-rewrite-todo.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
Now part of ag/rebase-i-in-c
* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits
. rebase--interactive: rewrite the edit-todo functionality in C
. editor: add a function to launch the sequence editor
. Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
(this branch uses ag/rebase-i-append-todo-help.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
Now part of ag/rebase-i-in-c
* ab/fetch-tags-noclobber (2018-05-16) 9 commits
- fixup! push tests: assert re-pushing annotated tags
- fetch: stop clobbering existing tags without --force
- fetch tests: add a test clobbering tag behavior
- fetch tests: correct a comment "remove it" -> "remove them"
- push doc: correct lies about how push refspecs work
- push tests: assert re-pushing annotated tags
- push tests: add more testing for forced tag pushing
- push tests: fix logic error in "push" test assertion
- push tests: remove redundant 'git push' invocation
Discarded per request.
cf. <87po09cnir.fsf@evledraar.gmail.com>
* nd/use-the-index-compat-less (2018-06-25) 13 commits
. wt-status.c: stop using index compat macros
. sha1-name.c: stop using index compat macros
. sequencer.c: stop using index compat macros
. revision.c: stop using index compat macros
. rerere.c: stop using index compat macros
. merge.c: stop using index compat macros
. merge-recursive.c: stop using index compat macros
. entry.c: stop using index compat macros
. diff.c: stop using index compat macros
. diff-lib.c: stop using index compat macros
. check-racy.c: stop using index compat macros
. blame.c: stop using index compat macros
. apply.c: stop using index compat macros
Retracted to be replaced with a more vertical approach where the
lower-level helper functions are taught to be capable of working on
an istate instance that is not the_index first, and then upwards to
support the application layer that wants to work on an arbitrary
istate instance, as the goal is not a mechanical replacement of
foo_cache(...) to foo_index(&the_index, ...).
* js/branch-diff (2018-05-16) 19 commits
. fixup! Add a function to solve least-cost assignment problems
. completion: support branch-diff
. branch-diff: add a man page
. branch-diff --dual-color: work around bogus white-space warning
. branch-diff: offer to dual-color the diffs
. diff: add an internal option to dual-color diffs of diffs
. color: provide inverted colors, too
. branch-diff: use color for the commit pairs
. branch-diff: add tests
. branch-diff: do not show "function names" in hunk headers
. branch-diff: adjust the output of the commit pairs
. branch-diff: suppress the diff headers
. branch-diff: indent the diffs just like tbdiff
. branch-diff: right-trim commit messages
. branch-diff: also show the diff between patches
. branch-diff: improve the order of the shown commits
. branch-diff: first rudimentary implementation
. Add a new builtin: branch-diff
. Add a function to solve least-cost assignment problems
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jul 2018, #01; Wed, 11)
@ 2018-07-11 19:02 5% Junio C Hamano
0 siblings, 0 replies; 20+ results
From: Junio C Hamano @ 2018-07-11 19:02 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of 'next' has been rewound and it currently has only 4
topics. Quite a many topics are cooking in 'pu' and need to be
sifted into good bins (for 'next') and the remainder. Help is
appreciated in that area ;-)
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ag/rebase-i-in-c (2018-07-10) 13 commits
- rebase -i: rewrite the rest of init_revisions_and_shortrevisions in C
- rebase -i: implement the logic to initialize the variable $revision in C
- rebase--interactive: remove unused modes and functions
- rebase--interactive: rewrite complete_action() in C
- sequencer: change the way skip_unnecessary_picks() returns its result
- sequencer: refactor append_todo_help() to write its message to a buffer
- rebase -i: rewrite checkout_onto() in C
- rebase -i: rewrite setup_reflog_action() in C
- sequencer: add a new function to silence a command, except if it fails
- rebase-interactive: rewrite the edit-todo functionality in C
- editor: add a function to launch the sequence editor
- rebase--interactive: rewrite append_todo_help() in C
- sequencer: make two functions and an enum from sequencer.c public
Piecemeal rewrite of the remaining "rebase -i" machinery in C.
Expecting a reroll.
The early parts of the series seem solidifying; perhaps with a
reroll or two, they become 'next' material?
* en/apply-comment-fix (2018-06-28) 1 commit
- apply: fix grammar error in comment
Will merge to 'next'.
* en/t5407-rebase-m-fix (2018-06-28) 1 commit
- t5407: fix test to cover intended arguments
Will merge to 'next'.
* sb/mailmap (2018-06-29) 1 commit
(merged to 'next' on 2018-07-11 at d9dc53e374)
+ .mailmap: merge different spellings of names
Will merge to 'master'.
* sb/object-store-lookup (2018-06-29) 33 commits
- commit.c: allow lookup_commit_reference to handle arbitrary repositories
- commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories
- tag.c: allow deref_tag to handle arbitrary repositories
- object.c: allow parse_object to handle arbitrary repositories
- object.c: allow parse_object_buffer to handle arbitrary repositories
- commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
- commit.c: allow set_commit_buffer to handle arbitrary repositories
- commit.c: migrate the commit buffer to the parsed object store
- commit-slabs: remove realloc counter outside of slab struct
- commit.c: allow parse_commit_buffer to handle arbitrary repositories
- tag: allow parse_tag_buffer to handle arbitrary repositories
- tag: allow lookup_tag to handle arbitrary repositories
- commit: allow lookup_commit to handle arbitrary repositories
- tree: allow lookup_tree to handle arbitrary repositories
- blob: allow lookup_blob to handle arbitrary repositories
- object: allow lookup_object to handle arbitrary repositories
- object: allow object_as_type to handle arbitrary repositories
- tag: add repository argument to deref_tag
- tag: add repository argument to parse_tag_buffer
- tag: add repository argument to lookup_tag
- commit: add repository argument to get_cached_commit_buffer
- commit: add repository argument to set_commit_buffer
- commit: add repository argument to parse_commit_buffer
- commit: add repository argument to lookup_commit
- commit: add repository argument to lookup_commit_reference
- commit: add repository argument to lookup_commit_reference_gently
- tree: add repository argument to lookup_tree
- blob: add repository argument to lookup_blob
- object: add repository argument to object_as_type
- object: add repository argument to parse_object_buffer
- object: add repository argument to lookup_object
- object: add repository argument to parse_object
- Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
(this branch uses sb/object-store-grafts.)
lookup_commit_reference() and friends have been updated to find
in-core object for a specific in-core repository instance.
Will merge to 'next'.
* ag/rebase-p (2018-07-06) 1 commit
- git-rebase--preserve-merges: fix formatting of todo help message
The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.
Will merge to 'next'.
* bb/pedantic (2018-07-09) 8 commits
- utf8.c: avoid char overflow
- string-list.c: avoid conversion from void * to function pointer
- sequencer.c: avoid empty statements at top level
- convert.c: replace "\e" escapes with "\033".
- fixup! refs/refs-internal.h: avoid forward declaration of an enum
- refs/refs-internal.h: avoid forward declaration of an enum
- fixup! connect.h: avoid forward declaration of an enum
- connect.h: avoid forward declaration of an enum
The codebase has been updated to compile cleanly with -pedantic
option.
Will merge to 'next'.
* bb/unicode-11-width (2018-07-09) 1 commit
- unicode: update the width tables to Unicode 11
The character display width table has been updated to match the
latest Unicode standard.
Will merge to 'next'.
* bc/object-id (2018-07-09) 17 commits
- pretty: switch hard-coded constants to the_hash_algo
- sha1-file: convert constants to uses of the_hash_algo
- log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
- diff: switch GIT_SHA1_HEXSZ to use the_hash_algo
- builtin/merge-recursive: make hash independent
- builtin/merge: switch to use the_hash_algo
- builtin/fmt-merge-msg: make hash independent
- builtin/update-index: simplify parsing of cacheinfo
- builtin/update-index: convert to using the_hash_algo
- refs/files-backend: use the_hash_algo for writing refs
- commit: increase commit message buffer size
- sha1-name: use the_hash_algo when parsing object names
- strbuf: allocate space with GIT_MAX_HEXSZ
- commit: express tree entry constants in terms of the_hash_algo
- hex: switch to using the_hash_algo
- tree-walk: replace hard-coded constants with the_hash_algo
- cache: update object ID functions for the_hash_algo
Conversion from uchar[40] to struct object_id continues.
Expecting a reroll.
cf. <20180709232656.GA535220@genre.crustytoothpaste.net>
* bc/send-email-auto-cte (2018-07-09) 4 commits
- docs: correct RFC specifying email line length
- send-email: automatically determine transfer-encoding
- send-email: accept long lines with suitable transfer encoding
- send-email: add an auto option for transfer encoding
The content-transfer-encoding of the message "git send-email" sends
out by default was 8bit, which can cause trouble when there is an
overlong line to bust RFC 5322/2822 limit. A new option 'auto' to
automatically switch to quoted-printable when there is such a line
in the payload has been introduced and is made the default.
Will merge to 'next'.
* en/dirty-merge-fixes (2018-07-11) 9 commits
- merge: fix misleading pre-merge check documentation
- merge-recursive: enforce rule that index matches head before merging
- t6044: add more testcases with staged changes before a merge is invoked
- merge-recursive: fix assumption that head tree being merged is HEAD
- merge-recursive: make sure when we say we abort that we actually abort
- t6044: add a testcase for index matching head, when head doesn't match HEAD
- t6044: verify that merges expected to abort actually abort
- index_has_changes(): avoid assuming operating on the_index
- read-cache.c: move index_has_changes() from merge.c
The recursive merge strategy did not properly ensure there was no
change between HEAD and the index before performing its operation,
which has been corrected.
Will merge to 'next'.
* en/t6036-merge-recursive-tests (2018-07-11) 6 commits
- t6036: add a failed conflict detection case: regular files, different modes
- t6036: add a failed conflict detection case with conflicting types
- t6036: add a failed conflict detection case with submodule add/add
- t6036: add a failed conflict detection case with submodule modify/modify
- t6036: add a failed conflict detection case with symlink add/add
- t6036: add a failed conflict detection case with symlink modify/modify
Tests to cover various conflicting cases have been added for
merge-recursive.
Will merge to 'next'.
* en/t6036-recursive-corner-cases (2018-07-06) 1 commit
- t6036: add lots of detail for directory/file conflicts in recursive case
Tests to cover more D/F conflict cases have been added for
merge-recursive.
Will merge to 'next'.
* en/t6042-insane-merge-rename-testcases (2018-07-03) 3 commits
- t6042: add testcase covering long chains of rename conflicts
- t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
- t6042: add testcase covering rename/add/delete conflict type
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
Will merge to 'next'.
I am not sure if there is a single "correct" answer everybody can
agree on for each of these "insane" cases, though.
* en/t7405-recursive-submodule-conflicts (2018-07-11) 3 commits
- t7405: verify 'merge --abort' works after submodule/path conflicts
- t7405: add a directory/submodule conflict
- t7405: add a file/submodule conflict
Tests to cover conflict cases that involve submodules have been
added for merge-recursive.
Will merge to 'next'.
* es/test-fixes (2018-07-03) 25 commits
- t9119: fix broken &&-chains
- t9000-t9999: fix broken &&-chains
- t7000-t7999: fix broken &&-chains
- t6000-t6999: fix broken &&-chains
- t5000-t5999: fix broken &&-chains
- t4000-t4999: fix broken &&-chains
- t3030: fix broken &&-chains
- t3000-t3999: fix broken &&-chains
- t2000-t2999: fix broken &&-chains
- t1000-t1999: fix broken &&-chains
- t0000-t0999: fix broken &&-chains
- t9814: simplify convoluted check that command correctly errors out
- t9001: fix broken "invoke hook" test
- t7810: use test_expect_code() instead of hand-rolled comparison
- t7400: fix broken "submodule add/reconfigure --force" test
- t7201: drop pointless "exit 0" at end of subshell
- t6036: fix broken "merge fails but has appropriate contents" tests
- t5505: modernize and simplify hard-to-digest test
- t5406: use write_script() instead of birthing shell script manually
- t5405: use test_must_fail() instead of checking exit code manually
- t/lib-submodule-update: fix "absorbing" test
- t: drop unnecessary terminating semicolon in subshell
- t: use sane_unset() rather than 'unset' with broken &&-chain
- t: use test_write_lines() instead of series of 'echo' commands
- t: use test_might_fail() instead of manipulating exit code manually
Test clean-up and corrections.
Will merge to 'next'.
* jk/empty-pick-fix (2018-07-11) 2 commits
- sequencer: don't say BUG on bogus input
- sequencer: handle empty-set cases consistently
Handling of an empty range by "git cherry-pick" was inconsistent
depending on how the range ended up to be empty, which has been
corrected.
Will merge to 'next'.
* jk/fetch-all-peeled-fix (2018-07-06) 1 commit
- t5500: prettify non-commit tag tests
Test modernization.
Will merge to 'next'.
* jk/for-each-ref-icase (2018-07-03) 3 commits
- ref-filter: avoid backend filtering with --ignore-case
- for-each-ref: consistently pass WM_IGNORECASE flag
- t6300: add a test for --ignore-case
The "--ignore-case" option of "git for-each-ref" (and its friends)
did not work correctly, which has been fixed.
Will merge to 'next'.
* jk/fsck-gitmodules-gently (2018-07-03) 5 commits
- fsck: silence stderr when parsing .gitmodules
- fsck: silence stderr when parsing .gitmodules
- config: add options parameter to git_config_from_mem
- config: add CONFIG_ERROR_SILENT handler
- config: turn die_on_error into caller-facing enum
What's the status of this one?
* js/range-diff (2018-07-09) 20 commits
- range-diff: make --dual-color the default mode
- range-diff: left-pad patch numbers
- completion: support `git range-diff`
- range-diff: add a man page
- range-diff --dual-color: work around bogus white-space warning
- range-diff: offer to dual-color the diffs
- diff: add an internal option to dual-color diffs of diffs
- color: add the meta color GIT_COLOR_REVERSE
- range-diff: use color for the commit pairs
- range-diff: add tests
- range-diff: do not show "function names" in hunk headers
- range-diff: adjust the output of the commit pairs
- range-diff: suppress the diff headers
- range-diff: indent the diffs just like tbdiff
- range-diff: right-trim commit messages
- range-diff: also show the diff between patches
- range-diff: improve the order of the shown commits
- range-diff: first rudimentary implementation
- Introduce `range-diff` to compare iterations of a topic branch
- linear-assignment: a function to solve least-cost assignment problems
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
Supersedes js/branch-diff topic that added a similar command under
a different name.
* jt/commit-graph-per-object-store (2018-07-09) 6 commits
. commit-graph: add repo arg to graph readers
. commit-graph: store graph in struct object_store
. commit-graph: add free_commit_graph
. commit-graph: add missing forward declaration
. object-store: add missing include
. commit-graph: refactor preparing commit graph
(this branch uses ds/commit-graph-fsck.)
The singleton commit-graph in-core instance is made per in-core
repository instance.
Expecting a reroll, as it breaks 32-bit build.
cf. https://travis-ci.org/git/git/jobs/402422108
* jt/partial-clone-fsck-connectivity (2018-07-09) 2 commits
- clone: check connectivity even if clone is partial
- upload-pack: send refs' objects despite "filter"
(this branch uses bw/ref-in-want and jt/connectivity-check-after-unshallow.)
Partial clone support of "git clone" has been updated to correctly
validate the objects it receives from the other side. The server
side has been corrected to send objects that are directly
requested, even if they may match the filtering criteria (e.g. when
doing a "lazy blob" partial clone).
Will merge to 'next'.
* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
- gc --auto: release pack files before auto packing
"git gc --auto" opens file descriptors for the packfiles before
spawning "git repack/prune", which would upset Windows that does
not want a process to work on a file that is open by another
process. The issue has been worked around.
Will merge to 'next'.
* kn/userdiff-php (2018-07-06) 2 commits
- userdiff: support new keywords in PHP hunk header
- t4018: add missing test cases for PHP
The userdiff pattern for .php has been updated.
Will merge to 'next'.
* lt/date-human (2018-07-09) 1 commit
- Add 'human' date format
* mh/fast-import-no-diff-delta-empty (2018-07-06) 1 commit
- fast-import: do not call diff_delta() with empty buffer
"git fast-import" has been updated to avoid attempting to create
delta against a zero-byte-long string, which is pointless.
Will merge to 'next'.
* ot/ref-filter-object-info (2018-07-09) 4 commits
. ref-filter: use oid_object_info() to get object
. ref-filter: merge get_obj and get_object
. ref-filter: add empty values to technical fields
. ref-filter: add info_source to valid_atom
Expecting a reroll, as it breaks compilation with uninitialized var.
cf. https://travis-ci.org/git/git/jobs/402422102
* pk/rebase-in-c (2018-07-09) 4 commits
- builtin/rebase: support running "git rebase <upstream>"
- sequencer: refactor the code to detach HEAD to checkout.c
- rebase: refactor common shell functions into their own file
- rebase: start implementing it as a builtin
Piecemeal rewrite of the "rebase" machinery in C.
Expecting a reroll, but it seems that this is getting quite close.
cf. <CAOZc8M8YmLwJOzG-1jyz8ft4W_tJMwNs6kSV8inX1q_zmDW8Sg@mail.gmail.com>
* tb/config-default (2018-07-06) 1 commit
- builtin/config: work around an unsized array forward declaration
Compilation fix.
Will merge to 'next'.
* bp/log-ref-write-fd-with-strbuf (2018-07-10) 1 commit
- convert log_ref_write_fd() to use strbuf
Code clean-up.
Will merge to 'next'.
* hs/push-cert-check-cleanup (2018-07-11) 2 commits
- gpg-interface: make parse_gpg_output static and remove from interface header
- builtin/receive-pack: use check_signature from gpg-interface
Code clean-up.
Will merge to 'next'.
* mk/merge-in-sparse-checkout (2018-07-11) 1 commit
- unpack-trees: do not fail reset because of unmerged skipped entry
"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* pw/add-p-select (2018-03-16) 3 commits
- add -p: optimize line selection for short hunks
- add -p: allow line selection to be inverted
- add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose
individual added/removed lines to be used in the operation, instead
of accepting or rejecting a whole hunk.
Expecting a reroll to reignite the discussion.
cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
* jh/json-writer (2018-06-13) 1 commit
- json_writer: new routines to create JSON data
Preparatory code to later add json output for unspecified telemetry
data.
We do not add random code that does not have real users to our
codebase, so let's have it wait until such a real code materializes
before too long.
* hn/bisect-first-parent (2018-04-21) 1 commit
- bisect: create 'bisect_flags' parameter in find_bisection()
Preliminary code update to allow passing more flags down the
bisection codepath in the future.
We do not add random code that does not have real users to our
codebase, so let's have it wait until such a real code materializes
before too long.
* av/fsmonitor-updates (2018-01-04) 6 commits
- fsmonitor: use fsmonitor data in `git diff`
- fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: update helper tool, now that flags are filled later
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
- dir.c: update comments to match argument name
Code clean-up on fsmonitor integration, plus optional utilization
of the fsmonitor data in diff-files.
Waiting for an update.
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
* pb/bisect-helper-2 (2018-06-13) 8 commits
- t6030: make various test to pass GETTEXT_POISON tests
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `bisect_reset` shell function in C
Expecting a reroll.
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
I just rebased the topic to a newer base as it did not build
standalone with the base I originally queued the topic on, but
otherwise there is no update to address any of the review comments
in the thread above---we are still waiting for a reroll.
* mk/http-backend-content-length (2018-06-11) 3 commits
- http-backend: respect CONTENT_LENGTH for receive-pack
- http-backend: respect CONTENT_LENGTH as specified by rfc3875
- http-backend: cleanup writing to child process
The http-backend (used for smart-http transport) used to slurp the
whole input until EOF, without paying attention to CONTENT_LENGTH
that is supplied in the environment and instead expecting the Web
server to close the input stream. This has been fixed.
* jk/drop-ancient-curl (2017-08-09) 5 commits
- http: #error on too-old curl
- curl: remove ifdef'd code never used with curl >=7.19.4
- http: drop support for curl < 7.19.4
- http: drop support for curl < 7.16.0
- http: drop support for curl < 7.11.1
Some code in http.c that has bitrot is being removed.
Expecting a reroll.
* mk/use-size-t-in-zlib (2017-08-10) 1 commit
. zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
Needs resurrecting by making sure the fix is good and still applies
(or adjusted to today's codebase).
--------------------------------------------------
[Cooking]
* ao/config-from-gitmodules (2018-06-26) 6 commits
(merged to 'next' on 2018-07-11 at 5d88dc6fb7)
+ submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
+ submodule-config: pass repository as argument to config_from_gitmodules
+ submodule-config: make 'config_from_gitmodules' private
+ submodule-config: add helper to get 'update-clone' config from .gitmodules
+ submodule-config: add helper function to get 'fetch' config from .gitmodules
+ config: move config_from_gitmodules to submodule-config.c
Tighten the API to make it harder to misuse in-tree .gitmodules
file, even though it shares the same syntax with configuration
files, to read random configuration items from it.
Will merge to 'master'.
* as/sequencer-customizable-comment-char (2018-06-28) 1 commit
- sequencer: use configured comment character
Honor core.commentchar when preparing the list of commits to replay
in "rebase -i".
Needs inter-contributor coordination.
cf. <e8973797-fc5f-2ca5-1881-5ee66fc8279b@living180.net>
* dj/runtime-prefix (2018-06-26) 1 commit
(merged to 'next' on 2018-07-11 at 27d99fef94)
+ Makefile: tweak sed invocation
POSIX portability fix in Makefile to fix a glitch introduced a few
releases ago.
Will merge to 'master'.
* ds/commit-graph (2018-06-28) 1 commit
(merged to 'next' on 2018-07-11 at d579f733ed)
+ commit-graph: fix documentation inconsistencies
Docfix.
Will merge to 'master'.
* en/rebase-i-microfixes (2018-06-27) 3 commits
(merged to 'next' on 2018-07-11 at d913ca0f77)
+ git-rebase--merge: modernize "git-$cmd" to "git $cmd"
+ Fix use of strategy options with interactive rebases
+ t3418: add testcase showing problems with rebase -i and strategy options
Will merge to 'master'.
* js/enhanced-version-info (2018-06-29) 1 commit
(merged to 'next' on 2018-07-11 at 815b2ea2bc)
+ Makefile: fix the "built from commit" code
Build fix.
Will merge to 'master'.
* js/rebase-recreate-merge (2018-06-27) 1 commit
(merged to 'next' on 2018-07-11 at eb8f33aaef)
+ rebase: fix documentation formatting
Docfix.
Will merge to 'master'.
* jt/connectivity-check-after-unshallow (2018-07-03) 1 commit
- fetch-pack: write shallow, then check connectivity
(this branch is used by jt/partial-clone-fsck-connectivity; uses bw/ref-in-want.)
"git fetch" failed to correctly validate the set of objects it
received when making a shallow history deeper, which has been
corrected.
Will merge to 'next'.
* jt/fetch-nego-tip (2018-07-03) 1 commit
- fetch-pack: support negotiation tip whitelist
(this branch uses jt/fetch-pack-negotiator.)
"git fetch" learned a new option "--negotiation-tip" to limit the
set of commits it tells the other end as "have", to reduce wasted
bandwidth and cycles, which would be helpful when the receiving
repository has a lot of refs that have little to do with the
history at the remote it is fetching from.
Will merge to 'next'.
* mb/filter-branch-optim (2018-06-26) 1 commit
(merged to 'next' on 2018-07-11 at e43a0136c2)
+ filter-branch: skip commits present on --state-branch
"git filter-branch" when used with the "--state-branch" option
still attempted to rewrite the commits whose filtered result is
known from the previous attempt (which is recorded on the state
branch); the command has been corrected not to waste cycles doing
so.
Will merge to 'master'.
* ms/core-icase-doc (2018-06-28) 1 commit
(merged to 'next' on 2018-07-11 at 8f0d71c32d)
+ Documentation: declare "core.ignoreCase" as internal variable
Clarify that setting core.ignoreCase to deviate from reality would
not turn a case-incapable filesystem into a case-capable one.
Will merge to 'master'.
* rj/submodule-fsck-skip (2018-07-03) 1 commit
(merged to 'next' on 2018-07-11 at 985f88cf7e)
+ fsck: check skiplist for object in fsck_blob()
"fsck.skipList" did not prevent a blob object listed there from
being inspected for is contents (e.g. we recently started to
inspect the contents of ".gitmodules" for certain malicious
patterns), which has been corrected.
Will merge to 'master'.
* tb/grep-only-matching (2018-07-09) 2 commits
- grep.c: teach 'git grep --only-matching'
- grep.c: extract show_line_header()
(this branch uses tb/grep-column.)
"git grep" learned the "--only-matching" option.
Will merge to 'next'.
* tz/exclude-doc-smallfixes (2018-06-27) 2 commits
(merged to 'next' on 2018-07-11 at 5134f1ca72)
+ dir.c: fix typos in core.excludesfile comment
+ gitignore.txt: clarify default core.excludesfile path
Doc updates.
Will merge to 'master'.
* ld/p423 (2018-06-19) 6 commits
(merged to 'next' on 2018-06-29 at af76acb664)
+ git-p4: python3: fix octal constants
+ git-p4: python3: use print() function
+ git-p4: python3: basestring workaround
+ git-p4: python3: remove backticks
+ git-p4: python3: replace dict.has_key(k) with "k in dict"
+ git-p4: python3: replace <> with !=
Code preparation to make "git p4" closer to be usable with Python 3.
Will merge to 'master'.
* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit
(merged to 'next' on 2018-06-29 at 538337be74)
+ sequencer: do not squash 'reword' commits when we hit conflicts
Bugfix for "rebase -i" corner case regression.
Will merge to 'master'.
* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit
(merged to 'next' on 2018-06-29 at 0dffc46ce2)
+ format-patch: clear UNINTERESTING flag before prepare_bases
Recently added "--base" option to "git format-patch" command did
not correctly generate prereq patch ids.
Will merge to 'master'.
* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit
(merged to 'next' on 2018-06-29 at da6f49d292)
+ docs: link to gitsubmodules
Docfix.
Will merge to 'master'.
* bw/ref-in-want (2018-06-28) 8 commits
- fetch-pack: implement ref-in-want
- fetch-pack: put shallow info in output parameter
- fetch: refactor to make function args narrower
- fetch: refactor fetch_refs into two functions
- fetch: refactor the population of peer ref OIDs
- upload-pack: test negotiation with changing repository
- upload-pack: implement ref-in-want
- test-pkt-line: add unpack-sideband subcommand
(this branch is used by jt/connectivity-check-after-unshallow and jt/partial-clone-fsck-connectivity.)
Protocol v2 has been updated to allow slightly out-of-sync set of
servers to work together to serve a single client, which would be
useful with load-balanced servers that talk smart HTTP transport.
Will merge to 'next'.
* en/rebase-consistency (2018-06-27) 9 commits
- git-rebase: make --allow-empty-message the default
- t3401: add directory rename testcases for rebase and am
- git-rebase.txt: document behavioral differences between modes
- directory-rename-detection.txt: technical docs on abilities and limitations
- git-rebase.txt: address confusion between --no-ff vs --force-rebase
- git-rebase: error out when incompatible options passed
- t3422: new testcases for checking when incompatible options passed
- git-rebase.sh: update help messages a bit
- git-rebase.txt: document incompatible options
"git rebase" behaved slightly differently depending on which one of
the three backends gets used; this has been documented and an
effort to make them more uniform has begun.
Will merge to 'next'.
* jt/remove-pack-bitmap-global (2018-06-21) 2 commits
(merged to 'next' on 2018-06-29 at 852857b04e)
+ pack-bitmap: add free function
+ pack-bitmap: remove bitmap_git global variable
The effort to move globals to per-repository in-core structure
continues.
Will merge to 'master'.
* sb/submodule-move-head-error-msg (2018-06-25) 1 commit
- submodule.c: report the submodule that an error occurs in
Will merge to 'next'.
* bw/protocol-v2 (2018-06-22) 1 commit
(merged to 'next' on 2018-06-29 at 78090cc343)
+ protocol-v2 doc: put HTTP headers after request
Doc fix.
Will merge to 'master'.
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
- branch: make "-l" a synonym for "--list"
(this branch uses jk/branch-l-0-deprecation.)
Updated plan to repurpose the "-l" option to "git branch".
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
* vs/typofixes (2018-06-22) 1 commit
(merged to 'next' on 2018-06-29 at 665c8db2f7)
+ Documentation: spelling and grammar fixes
Doc fix.
Will merge to 'master'.
* cc/remote-odb (2018-07-06) 10 commits
- SQUASH??? error: unused variable 'o' [-Werror=unused-variable]
- Documentation/config: add odb.<name>.promisorRemote
- t0410: test fetching from many promisor remotes
- Use odb.origin.partialclonefilter instead of core.partialclonefilter
- Use remote_odb_get_direct() and has_remote_odb()
- remote-odb: add remote_odb_reinit()
- remote-odb: implement remote_odb_get_many_direct()
- remote-odb: implement remote_odb_get_direct()
- Add initial remote odb support
- fetch-object: make functions return an error code
Needs a reroll.
* ds/multi-pack-index (2018-07-09) 24 commits
. midx: clear midx on repack
. packfile: skip loading index if in multi-pack-index
. midx: prevent duplicate packfile loads
. midx: use midx in approximate_object_count
. midx: use existing midx when writing new one
. midx: use midx in abbreviation calculations
. midx: read objects from multi-pack-index
. midx: prepare midxed_git struct
. config: create core.multiPackIndex setting
. midx: write object offsets
. midx: write object id fanout chunk
. midx: write object ids in a chunk
. midx: sort and deduplicate objects from packfiles
. midx: read pack names into array
. multi-pack-index: write pack names in chunk
. multi-pack-index: read packfile list
. packfile: generalize pack directory list
. multi-pack-index: expand test data
. multi-pack-index: load into memory
. midx: write header information to lockfile
. multi-pack-index: add 'write' verb
. multi-pack-index: add builtin
. multi-pack-index: add format details
. multi-pack-index: add design document
When there are too many packfiles in a repository (which is not
recommended), looking up an object in these would require
consulting many pack .idx files; a new mechanism to have a single
file that consolidates all of these .idx files is introduced.
Expecting a reroll to fix documentation build.
cf. https://travis-ci.org/git/git/jobs/402422110
* tb/grep-column (2018-06-22) 7 commits
(merged to 'next' on 2018-06-29 at 25dc70426e)
+ contrib/git-jump/git-jump: jump to exact location
+ grep.c: add configuration variables to show matched option
+ builtin/grep.c: add '--column' option to 'git-grep(1)'
+ grep.c: display column number of first match
+ grep.[ch]: extend grep_opt to allow showing matched column
+ grep.c: expose {,inverted} match column in match_line()
+ Documentation/config.txt: camel-case lineNumber for consistency
(this branch is used by tb/grep-only-matching.)
"git grep" learned the "--column" option that gives not just the
line number but the column number of the hit.
Will merge to 'master'.
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
- fetch-pack: introduce negotiator API
- fetch-pack: move common check and marking together
- fetch-pack: make negotiation-related vars local
- fetch-pack: use ref adv. to prune "have" sent
- fetch-pack: directly end negotiation if ACK ready
- fetch-pack: clear marks before re-marking
- fetch-pack: split up everything_local()
(this branch is used by jt/fetch-nego-tip.)
Code restructuring and a small fix to transport protocol v2 during
fetching.
Will merge to 'next'.
* sb/submodule-core-worktree (2018-06-19) 3 commits
(merged to 'next' on 2018-06-28 at 96e1a8dbd1)
+ submodule deinit: unset core.worktree
+ submodule: ensure core.worktree is set after update
+ submodule: unset core.worktree if no working tree is present
Originally merged to 'next' on 2018-06-22
"git submodule" did not correctly adjust core.worktree setting that
indicates whether/where a submodule repository has its associated
working tree across various state transitions, which has been
corrected.
Will merge to 'master'.
* ds/ewah-cleanup (2018-06-21) 10 commits
(merged to 'next' on 2018-06-28 at 9cd7c0d54a)
+ ewah: delete unused 'rlwit_discharge_empty()'
+ ewah: drop ewah_serialize_native function
+ ewah: drop ewah_deserialize function
+ ewah_io: delete unused 'ewah_serialize()'
+ ewah_bitmap: delete unused 'ewah_or()'
+ ewah_bitmap: delete unused 'ewah_not()'
+ ewah_bitmap: delete unused 'ewah_and_not()'
+ ewah_bitmap: delete unused 'ewah_and()'
+ ewah/bitmap.c: delete unused 'bitmap_each_bit()'
+ ewah/bitmap.c: delete unused 'bitmap_clear()'
Originally merged to 'next' on 2018-06-22
Remove unused function definitions and declarations from ewah
bitmap subsystem.
Will merge to 'master'.
* is/parsing-line-range (2018-06-15) 2 commits
- log: prevent error if line range ends past end of file
- blame: prevent error if range ends past end of file
Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
take has been tweaked.
Will merge to 'next'.
* en/merge-recursive-cleanup (2018-06-12) 6 commits
(merged to 'next' on 2018-06-28 at 1a3646eb7d)
+ merge-recursive: add pointer about unduly complex looking code
+ merge-recursive: rename conflict_rename_*() family of functions
+ merge-recursive: clarify the rename_dir/RENAME_DIR meaning
+ merge-recursive: align labels with their respective code blocks
+ merge-recursive: fix numerous argument alignment issues
+ merge-recursive: fix miscellaneous grammar error in comment
Originally merged to 'next' on 2018-06-19
Code cleanup.
Will merge to 'master'.
* ab/checkout-default-remote (2018-06-11) 8 commits
- checkout & worktree: introduce checkout.defaultRemote
- checkout: add advice for ambiguous "checkout <branch>"
- builtin/checkout.c: use "ret" variable for return
- checkout: pass the "num_matches" up to callers
- checkout.c: change "unique" member to "num_matches"
- checkout.c: introduce an *_INIT macro
- checkout.h: wrap the arguments to unique_tracking_name()
- checkout tests: index should be clean after dwim checkout
"git checkout" and "git worktree add" learned to honor
checkout.defaultRemote when auto-vivifying a local branch out of a
remote tracking branch in a repository with multiple remotes that
have tracking branches that share the same names.
Will merge to 'next'.
* ds/commit-graph-fsck (2018-06-27) 22 commits
- commit-graph: update design document
- gc: automatically write commit-graph files
- commit-graph: add '--reachable' option
- commit-graph: use string-list API for input
- fsck: verify commit-graph
- commit-graph: verify contents match checksum
- commit-graph: test for corrupted octopus edge
- commit-graph: verify commit date
- commit-graph: verify generation number
- commit-graph: verify parent list
- commit-graph: verify root tree OIDs
- commit-graph: verify objects exist
- commit-graph: verify corrupt OID fanout and lookup
- commit-graph: verify required chunks are present
- commit-graph: verify catches corrupt signature
- commit-graph: add 'verify' subcommand
- commit-graph: load a root tree from specific graph
- commit: force commit to parse from object database
- commit-graph: parse commit from chosen graph
- commit-graph: fix GRAPH_MIN_SIZE
- commit-graph: UNLEAK before die()
- t5318-commit-graph.sh: use core.commitGraph
(this branch is used by jt/commit-graph-per-object-store.)
"git fsck" learns to make sure the optional commit-graph file is in
a sane state.
Will merge to 'next'.
* ma/wrapped-info (2018-05-28) 2 commits
- usage: prefix all lines in `vreportf()`, not just the first
- usage: extract `prefix_suffix_lines()` from `advise()`
An attempt to help making multi-line messages fed to warning(),
error(), and friends more easily translatable.
Will discard and wait for a cleaned-up rewrite.
cf. <20180529213957.GF7964@sigill.intra.peff.net>
* jm/cache-entry-from-mem-pool (2018-07-03) 8 commits
- block alloc: add validations around cache_entry lifecyle
- block alloc: allocate cache entries from mem_pool
- mem-pool: fill out functionality
- mem-pool: add life cycle management functions
- mem-pool: only search head block for available space
- block alloc: add lifecycle APIs for cache_entry structs
- read-cache: teach make_cache_entry to take object_id
- read-cache: teach refresh_cache_entry to take istate
For a large tree, the index needs to hold many cache entries
allocated on heap. These cache entries are now allocated out of a
dedicated memory pool to amortize malloc(3) overhead.
Will merge to 'next'.
This makes each cache-entry larger by either 4 or 8 bytes, which is
a bit sad, though.
* sb/object-store-grafts (2018-05-18) 19 commits
(merged to 'next' on 2018-06-28 at 02f70d6302)
+ commit: allow lookup_commit_graft to handle arbitrary repositories
+ commit: allow prepare_commit_graft to handle arbitrary repositories
+ shallow: migrate shallow information into the object parser
+ path.c: migrate global git_path_* to take a repository argument
+ cache: convert get_graft_file to handle arbitrary repositories
+ commit: convert read_graft_file to handle arbitrary repositories
+ commit: convert register_commit_graft to handle arbitrary repositories
+ commit: convert commit_graft_pos() to handle arbitrary repositories
+ shallow: add repository argument to is_repository_shallow
+ shallow: add repository argument to check_shallow_file_for_update
+ shallow: add repository argument to register_shallow
+ shallow: add repository argument to set_alternate_shallow_file
+ commit: add repository argument to lookup_commit_graft
+ commit: add repository argument to prepare_commit_graft
+ commit: add repository argument to read_graft_file
+ commit: add repository argument to register_commit_graft
+ commit: add repository argument to commit_graft_pos
+ object: move grafts to object parser
+ object-store: move object access functions to object-store.h
(this branch is used by sb/object-store-lookup.)
Originally merged to 'next' on 2018-06-22
The conversion to pass "the_repository" and then "a_repository"
throughout the object access API continues.
Will merge to 'master'.
* sb/diff-color-move-more (2018-06-29) 9 commits
- diff.c: add white space mode to move detection that allows indent changes
- diff.c: factor advance_or_nullify out of mark_color_as_moved
- diff.c: decouple white space treatment from move detection algorithm
- diff.c: add a blocks mode for moved code detection
- diff.c: adjust hash function signature to match hashmap expectation
- diff.c: do not pass diff options as keydata to hashmap
- t4015: avoid git as a pipe input
- xdiff/xdiffi.c: remove unneeded function declarations
- xdiff/xdiff.h: remove unused flags
"git diff --color-moved" feature has further been tweaked.
Will merge to 'next'.
* jk/branch-l-0-deprecation (2018-06-22) 3 commits
(merged to 'next' on 2018-06-29 at fac676dfb9)
+ branch: deprecate "-l" option
+ t: switch "branch -l" to "branch --create-reflog"
+ t3200: unset core.logallrefupdates when testing reflog creation
(this branch is used by jk/branch-l-1-repurpose.)
The "-l" option in "git branch -l" is an unfortunate short-hand for
"--create-reflog", but many users, both old and new, somehow expect
it to be something else, perhaps "--list". This step warns when "-l"
is used as a short-hand for "--create-reflog" and warns about the
future repurposing of the it when it is used.
Will merge to 'master'.
--------------------------------------------------
[Discarded]
* ag/rebase-i-append-todo-help (2018-06-14) 2 commits
. rebase--interactive: rewrite append_todo_help() in C
. Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
(this branch is used by ag/rebase-i-rewrite-todo.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
Now part of ag/rebase-i-in-c
* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits
. rebase--interactive: rewrite the edit-todo functionality in C
. editor: add a function to launch the sequence editor
. Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
(this branch uses ag/rebase-i-append-todo-help.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
Now part of ag/rebase-i-in-c
* ab/fetch-tags-noclobber (2018-05-16) 9 commits
- fixup! push tests: assert re-pushing annotated tags
- fetch: stop clobbering existing tags without --force
- fetch tests: add a test clobbering tag behavior
- fetch tests: correct a comment "remove it" -> "remove them"
- push doc: correct lies about how push refspecs work
- push tests: assert re-pushing annotated tags
- push tests: add more testing for forced tag pushing
- push tests: fix logic error in "push" test assertion
- push tests: remove redundant 'git push' invocation
Discarded per request.
cf. <87po09cnir.fsf@evledraar.gmail.com>
* nd/use-the-index-compat-less (2018-06-25) 13 commits
. wt-status.c: stop using index compat macros
. sha1-name.c: stop using index compat macros
. sequencer.c: stop using index compat macros
. revision.c: stop using index compat macros
. rerere.c: stop using index compat macros
. merge.c: stop using index compat macros
. merge-recursive.c: stop using index compat macros
. entry.c: stop using index compat macros
. diff.c: stop using index compat macros
. diff-lib.c: stop using index compat macros
. check-racy.c: stop using index compat macros
. blame.c: stop using index compat macros
. apply.c: stop using index compat macros
Retracted to be replaced with a more vertical approach where the
lower-level helper functions are taught to be capable of working on
an istate instance that is not the_index first, and then upwards to
support the application layer that wants to work on an arbitrary
istate instance, as the goal is not a mechanical replacement of
foo_cache(...) to foo_index(&the_index, ...).
* js/branch-diff (2018-05-16) 19 commits
. fixup! Add a function to solve least-cost assignment problems
. completion: support branch-diff
. branch-diff: add a man page
. branch-diff --dual-color: work around bogus white-space warning
. branch-diff: offer to dual-color the diffs
. diff: add an internal option to dual-color diffs of diffs
. color: provide inverted colors, too
. branch-diff: use color for the commit pairs
. branch-diff: add tests
. branch-diff: do not show "function names" in hunk headers
. branch-diff: adjust the output of the commit pairs
. branch-diff: suppress the diff headers
. branch-diff: indent the diffs just like tbdiff
. branch-diff: right-trim commit messages
. branch-diff: also show the diff between patches
. branch-diff: improve the order of the shown commits
. branch-diff: first rudimentary implementation
. Add a new builtin: branch-diff
. Add a function to solve least-cost assignment problems
"git tbdiff" that lets us compare individual patches in two
iterations of a topic has been rewritten and made into a built-in
command.
^ permalink raw reply [relevance 5%]
* Re: [PATCH v3 00/32] object-store: lookup_commit
2018-06-29 1:21 6% [PATCH v3 00/32] object-store: lookup_commit Stefan Beller
2018-06-29 14:53 0% ` Derrick Stolee
@ 2018-06-29 17:57 0% ` Junio C Hamano
1 sibling, 0 replies; 20+ results
From: Junio C Hamano @ 2018-06-29 17:57 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.com> writes:
> This continues the elimination of global variables in the object store and
> teaches lookup_commit[_reference] and alike to handle a_repository.
>
> This is also available as
> https://github.com/stefanbeller/git/tree/object-store-lookup-commit
> or applies on top of 02f70d63027 (Merge branch 'sb/object-store-grafts'
> into next, 2018-06-28).
>
> Picking a base for this one is really hard, as nearly all series currently
> cooking or in flight collide with it on one or two lines. (lookup_* is used
> heavily, who would have thought?)
One technique these (not just this) recent efforts seem to be
forgetting is to introduce "new" names that take a_repo and then
make the existing one a thin wrapper that calls the new one with
&the_repo as the argument.
IOW, a new call to lookup_commit_reference(oid) in a function that
is happy to access the default repo (and notice taht 99% of our code
is happy with using just the currrent repository the user started
the git process for) does not need to be updated to call the
function with the same name with a different function signature
lookup_commit_reference(the_repo, oid). If we name the new one
lookup_commit_reference_in_repo(r, oid) and make the callers that
already take a repo pointer call it, while leaving the callers that
do not even know or care about multiple in-core repo instances alone
to keep calling lookup_commit_reference(oid), you do not have to
worry too much about colliding. That way, you do not have to step
on each others' toes with avoidable semantic merge conflicts and
incrementally improve things over time, no?
Thanks.
^ permalink raw reply [relevance 0%]
* Re: [PATCH v3 00/32] object-store: lookup_commit
2018-06-29 1:21 6% [PATCH v3 00/32] object-store: lookup_commit Stefan Beller
@ 2018-06-29 14:53 0% ` Derrick Stolee
2018-06-29 17:57 0% ` Junio C Hamano
1 sibling, 0 replies; 20+ results
From: Derrick Stolee @ 2018-06-29 14:53 UTC (permalink / raw)
To: Stefan Beller, git
On 6/28/2018 9:21 PM, Stefan Beller wrote:
> This continues the elimination of global variables in the object store and
> teaches lookup_commit[_reference] and alike to handle a_repository.
>
> This is also available as
> https://github.com/stefanbeller/git/tree/object-store-lookup-commit
> or applies on top of 02f70d63027 (Merge branch 'sb/object-store-grafts'
> into next, 2018-06-28).
>
> Picking a base for this one is really hard, as nearly all series currently
> cooking or in flight collide with it on one or two lines. (lookup_* is used
> heavily, who would have thought?); I really needed 'sb/object-store-grafts'
> to build on; and there is only one other series before that in current next,
> which this series would have conflicted with, if not based on top of it.
>
> In "The state of the object store series" [1], this was tentatively named
> "sb/object-store-lookup".
As usual, this series was easy to review. It has a few places where it
conflicts with ds/commit-graph-fsck, but they are not hard to resolve. I
created a merge commit between that branch and your version of this
series [1]. It passes all tests on my machine.
Thanks,
-Stolee
[1]
https://github.com/derrickstolee/git/commits/commit-graph-fsck-and-object-store
^ permalink raw reply [relevance 0%]
* [PATCH v3 00/32] object-store: lookup_commit
@ 2018-06-29 1:21 6% Stefan Beller
2018-06-29 14:53 0% ` Derrick Stolee
2018-06-29 17:57 0% ` Junio C Hamano
0 siblings, 2 replies; 20+ results
From: Stefan Beller @ 2018-06-29 1:21 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
This continues the elimination of global variables in the object store and
teaches lookup_commit[_reference] and alike to handle a_repository.
This is also available as
https://github.com/stefanbeller/git/tree/object-store-lookup-commit
or applies on top of 02f70d63027 (Merge branch 'sb/object-store-grafts'
into next, 2018-06-28).
Picking a base for this one is really hard, as nearly all series currently
cooking or in flight collide with it on one or two lines. (lookup_* is used
heavily, who would have thought?); I really needed 'sb/object-store-grafts'
to build on; and there is only one other series before that in current next,
which this series would have conflicted with, if not based on top of it.
In "The state of the object store series" [1], this was tentatively named
"sb/object-store-lookup".
Thanks,
Stefan
[1] https://public-inbox.org/git/CAGZ79kZtEZA1rvgfSCS+m4dsrB86Cf-XiePWQmeU-kCNxP_NLQ@mail.gmail.com/
v2 https://public-inbox.org/git/20180613230522.55335-1-sbeller@google.com/
* removed mentions of cooci patches
* added forward declaration of commit buffer slabs.
* dropped 3 patches that add the repository to lookup_unkonwn_object,
parse_commit and parse_commit_gently, but were not converting those
functions. We'll convert these in the next series, as this series is
growing big already.
* This series can be found as branch 'object-store-lookup-commit' on github,
it applies on top of nd/commit-util-to-slab merged with sb/object-store-grafts
v1, https://public-inbox.org/git/20180530004810.30076-1-sbeller@google.com/
This applies on the merge of nd/commit-util-to-slab and sb/object-store-grafts,
and is available at http://github.com/stefanbeller/ as branch object-store-lookup-commit
as the merge has some merge conflicts as well as syntactical conflicts (upload-pack.c
and fetch-pack.c introduce new calls of functions that would want to take a repository struct
in the object-store-grafts series)
As layed out in https://public-inbox.org/git/20180517225154.9200-1-sbeller@google.com/
this is getting close to finishing the set of object store series though the last
unfinished part of this RFC hints at new work on the plate:
* To give this series a nice polish, we'd want to convert parse_commit, too.
But that requires the conversion of the new commit graph. Maybe we need
to split this series into 2.
* Once this is in good shape we can talk about converting parts of the revision
walking code,
* which then can be used by the submodule code as the end goal for the
object store series.
Thanks,
Stefan
Stefan Beller (32):
object: add repository argument to parse_object
object: add repository argument to lookup_object
object: add repository argument to parse_object_buffer
object: add repository argument to object_as_type
blob: add repository argument to lookup_blob
tree: add repository argument to lookup_tree
commit: add repository argument to lookup_commit_reference_gently
commit: add repository argument to lookup_commit_reference
commit: add repository argument to lookup_commit
commit: add repository argument to parse_commit_buffer
commit: add repository argument to set_commit_buffer
commit: add repository argument to get_cached_commit_buffer
tag: add repository argument to lookup_tag
tag: add repository argument to parse_tag_buffer
tag: add repository argument to deref_tag
object: allow object_as_type to handle arbitrary repositories
object: allow lookup_object to handle arbitrary repositories
blob: allow lookup_blob to handle arbitrary repositories
tree: allow lookup_tree to handle arbitrary repositories
commit: allow lookup_commit to handle arbitrary repositories
tag: allow lookup_tag to handle arbitrary repositories
tag: allow parse_tag_buffer to handle arbitrary repositories
commit.c: allow parse_commit_buffer to handle arbitrary repositories
commit-slabs: remove realloc counter outside of slab struct
commit.c: migrate the commit buffer to the parsed object store
commit.c: allow set_commit_buffer to handle arbitrary repositories
commit.c: allow get_cached_commit_buffer to handle arbitrary
repositories
object.c: allow parse_object_buffer to handle arbitrary repositories
object.c: allow parse_object to handle arbitrary repositories
tag.c: allow deref_tag to handle arbitrary repositories
commit.c: allow lookup_commit_reference_gently to handle arbitrary
repositories
commit.c: allow lookup_commit_reference to handle arbitrary
repositories
archive.c | 2 +-
bisect.c | 2 +-
blame.c | 13 ++++---
blob.c | 10 ++---
blob.h | 2 +-
branch.c | 2 +-
builtin/am.c | 9 +++--
builtin/branch.c | 7 ++--
builtin/checkout.c | 6 +--
builtin/clone.c | 3 +-
builtin/commit-tree.c | 4 +-
builtin/describe.c | 13 ++++---
builtin/diff-tree.c | 9 +++--
builtin/diff.c | 7 ++--
builtin/fast-export.c | 14 ++++---
builtin/fetch.c | 9 +++--
builtin/fmt-merge-msg.c | 9 +++--
builtin/fsck.c | 21 +++++++----
builtin/grep.c | 3 +-
builtin/index-pack.c | 5 ++-
builtin/log.c | 10 +++--
builtin/merge-base.c | 7 ++--
builtin/merge-tree.c | 3 +-
builtin/name-rev.c | 13 ++++---
builtin/notes.c | 3 +-
builtin/pack-objects.c | 2 +-
builtin/prune.c | 2 +-
builtin/pull.c | 15 +++++---
builtin/receive-pack.c | 6 +--
builtin/reflog.c | 15 +++++---
builtin/replace.c | 8 ++--
builtin/reset.c | 4 +-
builtin/rev-list.c | 2 +-
builtin/rev-parse.c | 6 +--
builtin/show-branch.c | 5 ++-
builtin/tag.c | 2 +-
builtin/unpack-objects.c | 7 ++--
builtin/verify-commit.c | 4 +-
bundle.c | 10 +++--
cache-tree.c | 3 +-
commit-graph.c | 14 +++----
commit-slab-impl.h | 3 --
commit.c | 80 +++++++++++++++++++++++++---------------
commit.h | 18 ++++++---
fast-import.c | 6 ++-
fetch-pack.c | 39 ++++++++++++--------
fsck.c | 9 +++--
http-backend.c | 4 +-
http-push.c | 16 +++++---
line-log.c | 2 +-
list-objects.c | 4 +-
log-tree.c | 13 ++++---
merge-recursive.c | 17 +++++----
notes-cache.c | 3 +-
notes-merge.c | 5 ++-
notes-utils.c | 4 +-
object.c | 61 ++++++++++++++++--------------
object.h | 12 ++++--
packfile.c | 2 +-
parse-options-cb.c | 2 +-
pretty.c | 4 +-
reachable.c | 8 ++--
ref-filter.c | 12 ++++--
reflog-walk.c | 3 +-
refs.c | 2 +-
refs/files-backend.c | 2 +-
remote.c | 19 ++++++----
revision.c | 26 ++++++-------
sequencer.c | 14 +++----
server-info.c | 4 +-
sha1-file.c | 4 +-
sha1-name.c | 33 +++++++++--------
shallow.c | 30 +++++++++------
submodule.c | 4 +-
tag.c | 28 +++++++-------
tag.h | 7 ++--
tree.c | 19 +++++-----
tree.h | 2 +-
upload-pack.c | 17 +++++----
walker.c | 12 ++++--
wt-status.c | 2 +-
81 files changed, 485 insertions(+), 358 deletions(-)
--
2.18.0.399.gad0ab374a1-goog
^ permalink raw reply [relevance 6%]
* Re: The state of the object store series
2018-06-19 22:07 7% The state of the object store series Stefan Beller
@ 2018-06-22 0:59 0% ` Derrick Stolee
0 siblings, 0 replies; 20+ results
From: Derrick Stolee @ 2018-06-22 0:59 UTC (permalink / raw)
To: Stefan Beller, git
[My email client says I sent this two days ago, but it doesn't appear on
public-inbox.org, so somehow it didn't land on-list (Stefan pointed out
that the message was in HTML). Repeating the message now so I can
reference it in another discussion. -Stolee]
On 6/19/2018 6:07 PM, Stefan Beller wrote:
> There is an ongoing effort to remove global state currently and switch over
> to pass around the relevant data structures; for most of it we end up passing
> around 'the_repository' as it contains everything there is.
>
> Merged into master:
>
> fcb6df32546 Merge branch 'sb/oid-object-info'
> a2cec42213c Merge branch 'sb/object-store-replace'
> 3a1ec60c43b Merge branch 'sb/packfiles-in-repository'
> cf0b1793ead Merge branch 'sb/object-store'
>
> Currently cooking:
>
> 8c69a7d7e80 Merge branch 'sb/object-store-grafts' into pu
> 42d32d07298 Merge branch 'sb/object-store-alloc' into jch
>
> (both marked for "will merge to next" in the cooking report)
>
> Floating on the mailing list, not cooking yet:
>
> "sb/object-store-lookup"
> https://public-inbox.org/git/20180613230522.55335-1-sbeller@google.com/
> This clashes with other series in flight (Stolees get_tree series; see
> https://public-inbox.org/git/709bd61c-70fc-a925-efba-58ab9be265c9@gmail.com/
> I'll rebase this series on top of that series once the currently
> cooking series stabilize) "nd/kill-the_index"
> https://public-inbox.org/git/20180616054157.32433-1-pclouds@gmail.com/
> This converts the_index to pass around index pointers instead of
> the_repository; it fits into the theme, but Duys end goal differs from
> mine; he is less submodule focused. Work that still needs to be done: "xx/object-store-commit-graph"
> Convert the commit graph to have no global state, but be part of the
> repository struct. I think this can go in parallel to
> "sb/object-store-lookup",
> so I'll tackle that next. Thanks Stolee for looking ahead: There is only the
> commit graph itself as well as whether it has been prepared as a global
> variable. So this series will consist of passing around a repository struct
> for all those higher level functions that do not pass around the commit graph
> or parts of it.
There are some patches in ds/commit-graph-fsck that would be helpful for
this effort, and may be easier for you to take.
Specifically, these ones:
- commit-graph: load a root tree from specific graph
- commit: force commit to parse from object database
- commit-graph: parse commit from chosen graph
I'm waiting for sb/object-store-lookup to be in 'next' before I re-roll
that branch. If you're not in a rush to send this series, perhaps wait
for the next version here.
> "xx/finish-object-stores"
> This requires "xx/object-store-commit-graph" as well as
> "sb/object-store-lookup";
> it will convert parse_commit[_gently] to take a repository argument and will
> finish the actual object store part. This might be optional for the goal of
> converting submodules, that I have in mind, but it sure is a nice finishing
> touch.
>
> "xx/convert-revision-walking"
> This series aims to convert get_merge_bases(), in_merge_bases() and all its
> revision walking code to take a repository argument.
I'm playing around with a series that groups most commit walks into one
file, so they can share more code and we can more easily test their
correctness and performance. I'll send an RFC sometime that will
absolutely collide with this one, but I expect a full v1 patch will be
based on this series.
Thanks,
-Stolee
^ permalink raw reply [relevance 0%]
* The state of the object store series
@ 2018-06-19 22:07 7% Stefan Beller
2018-06-22 0:59 0% ` Derrick Stolee
0 siblings, 1 reply; 20+ results
From: Stefan Beller @ 2018-06-19 22:07 UTC (permalink / raw)
To: git
There is an ongoing effort to remove global state currently and switch over
to pass around the relevant data structures; for most of it we end up passing
around 'the_repository' as it contains everything there is.
Merged into master:
fcb6df32546 Merge branch 'sb/oid-object-info'
a2cec42213c Merge branch 'sb/object-store-replace'
3a1ec60c43b Merge branch 'sb/packfiles-in-repository'
cf0b1793ead Merge branch 'sb/object-store'
Currently cooking:
8c69a7d7e80 Merge branch 'sb/object-store-grafts' into pu
42d32d07298 Merge branch 'sb/object-store-alloc' into jch
(both marked for "will merge to next" in the cooking report)
Floating on the mailing list, not cooking yet:
"sb/object-store-lookup"
https://public-inbox.org/git/20180613230522.55335-1-sbeller@google.com/
This clashes with other series in flight (Stolees get_tree series; see
https://public-inbox.org/git/709bd61c-70fc-a925-efba-58ab9be265c9@gmail.com/
I'll rebase this series on top of that series once the currently cooking
series stabilize)
"nd/kill-the_index"
https://public-inbox.org/git/20180616054157.32433-1-pclouds@gmail.com/
This converts the_index to pass around index pointers instead of
the_repository;
it fits into the theme, but Duys end goal differs from mine; he is
less submodule focused.
Work that still needs to be done:
"xx/object-store-commit-graph"
Convert the commit graph to have no global state, but be part of the
repository struct. I think this can go in parallel to
"sb/object-store-lookup",
so I'll tackle that next. Thanks Stolee for looking ahead: There is only the
commit graph itself as well as whether it has been prepared as a global
variable. So this series will consist of passing around a repository struct
for all those higher level functions that do not pass around the commit graph
or parts of it.
"xx/finish-object-stores"
This requires "xx/object-store-commit-graph" as well as
"sb/object-store-lookup";
it will convert parse_commit[_gently] to take a repository argument and will
finish the actual object store part. This might be optional for the goal of
converting submodules, that I have in mind, but it sure is a nice finishing
touch.
"xx/convert-revision-walking"
This series aims to convert get_merge_bases(), in_merge_bases() and all its
revision walking code to take a repository argument.
"xx/submodule-dont-use-alternates"
Once "xx/convert-revision-walking" is in, convert the local
find_first_merges(),
and convert all functions to drop function add_submodule_odb() and instead
operate on the submodule repository instead of the_repository with the
submodule objects added as an alternate.
Thanks,
Stefan
^ permalink raw reply [relevance 7%]
* [PATCH v2 0/5] merge-recursive code cleanups
2018-05-19 2:06 5% [PATCH 0/5] merge-recursive code cleanups Elijah Newren
@ 2018-05-22 0:43 4% ` Elijah Newren
0 siblings, 0 replies; 20+ results
From: Elijah Newren @ 2018-05-22 0:43 UTC (permalink / raw)
To: gitster; +Cc: git, Johannes.Schindelin, Elijah Newren
This patch series contains several small code cleanups for merge-recursive.
I have removed a couple small cleanup chunks in order to avoid conflicts
with any other in-flight topics in pu (namely, nd/commit-util-to-slab and
sb/submodule-merge-in-merge-recursive). I may resend those later
separately.
The series was made on top of next (specifically commit 4fb28f7b1639
("Merge branch 'sb/object-store-replace' into next")); it will not
apply to master.
Changes since v1:
* As suggested by Dscho, replaced patch 5 with a pointer about the
fact that the code is that way to help translators
* Small rewordings or paragraph splittings suggested by Dscho
* Added Dscho's Acked-by on relevant patches (2-4)
Elijah Newren (5):
merge-recursive: fix miscellaneous grammar error in comment
merge-recursive: fix numerous argument alignment issues
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
merge-recursive: rename conflict_rename_*() family of functions
merge-recursive: add pointer about unduly complex looking code
merge-recursive.c | 152 ++++++++++++++++++++++++++--------------------
1 file changed, 87 insertions(+), 65 deletions(-)
branch-diff:
1: 1af1c7df17 = 1: 96225eddbb merge-recursive: fix miscellaneous grammar error in comment
2: 8ed7c8b588 ! 2: c63f72e96d merge-recursive: fix numerous argument alignment issues
@@ -5,6 +5,7 @@
Various refactorings throughout the code have left lots of alignment
issues that were driving me crazy; fix them.
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
3: e96b2cd9ae ! 3: 3d95e8b756 merge-recursive: clarify the rename_dir/RENAME_DIR meaning
@@ -4,14 +4,17 @@
We had an enum of rename types which included RENAME_DIR; this name felt
misleading since it was not about an entire directory but was a status for
- each individual file add that occurred within a renamed directory. Since
- this type is for signifying that the files in question were being renamed
- due to directory rename detection, rename this enum value to
- RENAME_VIA_DIR. Make a similar change to the conflict_rename_dir()
- function, and add a comment to the top of that function explaining its
- purpose (it may not be quite as obvious as for the other
- conflict_rename_*() functions).
+ each individual file add that occurred within a renamed directory.
+ Since this type is for signifying that the files in question were being
+ renamed due to directory rename detection, rename this enum value to
+ RENAME_VIA_DIR.
+
+ Make a similar change to the conflict_rename_dir() function, and add a
+ comment to the top of that function explaining its purpose (it may not be
+ quite as obvious as for the other conflict_rename_*() functions).
+
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -42,7 +45,7 @@
+ /*
+ * Handle file adds that need to be renamed due to directory rename
+ * detection. This differs from handle_rename_normal, because
-+ * there is no content merge to do; just move the path into the
++ * there is no content merge to do; just move the file into the
+ * desired final location.
+ */
const struct diff_filespec *dest = pair->two;
4: 4155613a6b ! 4: dfd6ab22db merge-recursive: rename conflict_rename_*() family of functions
@@ -24,6 +24,7 @@
from all the handle_rename_*() functions which are called from
process_entry().
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
5: 20b8963732 < --: ---------- merge-recursive: simplify handle_change_delete
--: ---------- > 5: 122629ef7a merge-recursive: add pointer about unduly complex looking code
--
2.17.0.847.g20b8963732
^ permalink raw reply [relevance 4%]
* [PATCH 0/5] merge-recursive code cleanups
@ 2018-05-19 2:06 5% Elijah Newren
2018-05-22 0:43 4% ` [PATCH v2 " Elijah Newren
0 siblings, 1 reply; 20+ results
From: Elijah Newren @ 2018-05-19 2:06 UTC (permalink / raw)
To: git; +Cc: Elijah Newren
This patch series contains several small code cleanups for merge-recursive.
I have removed a couple small cleanup chunks in order to avoid conflicts
with any other in-flight topics in pu (namely, nd/commit-util-to-slab and
sb/submodule-merge-in-merge-recursive). I may resend those later
separately.
The series was made on top of next (specifically commit c95db04db ("Merge
branch 'sb/object-store-replace' into next")); it will not apply to
master.
Elijah Newren (5):
merge-recursive: fix miscellaneous grammar error in comment
merge-recursive: fix numerous argument alignment issues
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
merge-recursive: rename conflict_rename_*() family of functions
merge-recursive: simplify handle_change_delete
merge-recursive.c | 173 ++++++++++++++++++++++------------------------
1 file changed, 83 insertions(+), 90 deletions(-)
--
2.17.0.847.g20b8963732
^ permalink raw reply [relevance 5%]
* Re: [PATCH 1/2] object.c: free replace map in raw_object_store_clear
2018-05-10 10:16 0% ` Junio C Hamano
@ 2018-05-10 17:23 0% ` Stefan Beller
0 siblings, 0 replies; 20+ results
From: Stefan Beller @ 2018-05-10 17:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Hi Junio,
On Thu, May 10, 2018 at 3:16 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> The replace map for objects was missed to free in the object store in
>> the conversion of 174774cd519 (Merge branch 'sb/object-store-replace',
>> 2018-05-08)
>
>
> Or is this just a simple "the topic that ends at 174774cd519^2 had
> this leak that needs to be fixed by this patch; instead of rerolling
> this is an incremental, because the topic has already been merged to
> 'master' and it is too late now"?
This is the case. I wondered if I want to point to the exact commit
(which I have trouble pointing to as the whole topic has no memory
leak fixes, Closest would be d88f9fdf8b2 (replace-object: move
replace_map to object store, 2018-04-11))
or rather just point at the series. I did not think of the confusion
that might arise there.
> Looking at this patch in the context of the side branch (instead of
> in the merged result) already makes sense to me, so I am guessing it
> is the latter (i.e. not a botched merge that missed semantic
> conflicts), in which case the proposed log message is a bit too
> alarming and points readers in a wrong direction. Shouldn't it
> point at, say, c1274495 ("replace-object: eliminate replace objects
> prepared flag", 2018-04-11) that turned the oidmap instance into a
> pointer in raw_object_store?
Ah, that is the best place to point at. Makes sense.
I'll reroll this,
Thanks,
Stefan
^ permalink raw reply [relevance 0%]
* Re: [PATCH 1/2] object.c: free replace map in raw_object_store_clear
2018-05-09 23:40 5% [PATCH 1/2] object.c: free replace map in raw_object_store_clear Stefan Beller
@ 2018-05-10 10:16 0% ` Junio C Hamano
2018-05-10 17:23 0% ` Stefan Beller
0 siblings, 1 reply; 20+ results
From: Junio C Hamano @ 2018-05-10 10:16 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.com> writes:
> The replace map for objects was missed to free in the object store in
> the conversion of 174774cd519 (Merge branch 'sb/object-store-replace',
> 2018-05-08)
I need a bit of clarification wrt the above. The above makes it
sound like the merge needed a semantic conflict resolution (e.g. one
side turned replace_map into a pointer while the other side added a
place where the containing structure is freed and now the merge
result needs to free the pointer in the new place that frees the
containing structure, but the merge forgot to do so). Is that what
is going on?
Or is this just a simple "the topic that ends at 174774cd519^2 had
this leak that needs to be fixed by this patch; instead of rerolling
this is an incremental, because the topic has already been merged to
'master' and it is too late now"?
Looking at this patch in the context of the side branch (instead of
in the merged result) already makes sense to me, so I am guessing it
is the latter (i.e. not a botched merge that missed semantic
conflicts), in which case the proposed log message is a bit too
alarming and points readers in a wrong direction. Shouldn't it
point at, say, c1274495 ("replace-object: eliminate replace objects
prepared flag", 2018-04-11) that turned the oidmap instance into a
pointer in raw_object_store?
Thanks.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> object.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/object.c b/object.c
> index 9d5b10d5a20..ff28f90c5ef 100644
> --- a/object.c
> +++ b/object.c
> @@ -497,6 +497,7 @@ void raw_object_store_clear(struct raw_object_store *o)
> {
> FREE_AND_NULL(o->objectdir);
> FREE_AND_NULL(o->alternate_db);
> + FREE_AND_NULL(o->replace_map);
>
> free_alt_odbs(o);
> o->alt_odb_tail = NULL;
^ permalink raw reply [relevance 0%]
* [PATCH 1/2] object.c: free replace map in raw_object_store_clear
@ 2018-05-09 23:40 5% Stefan Beller
2018-05-10 10:16 0% ` Junio C Hamano
0 siblings, 1 reply; 20+ results
From: Stefan Beller @ 2018-05-09 23:40 UTC (permalink / raw)
To: gitster; +Cc: git, Stefan Beller
The replace map for objects was missed to free in the object store in
the conversion of 174774cd519 (Merge branch 'sb/object-store-replace',
2018-05-08)
Signed-off-by: Stefan Beller <sbeller@google.com>
---
object.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/object.c b/object.c
index 9d5b10d5a20..ff28f90c5ef 100644
--- a/object.c
+++ b/object.c
@@ -497,6 +497,7 @@ void raw_object_store_clear(struct raw_object_store *o)
{
FREE_AND_NULL(o->objectdir);
FREE_AND_NULL(o->alternate_db);
+ FREE_AND_NULL(o->replace_map);
free_alt_odbs(o);
o->alt_odb_tail = NULL;
--
2.17.0.255.g8bfb7c0704
^ permalink raw reply related [relevance 5%]
Results 1-20 of 20 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-05-09 23:40 5% [PATCH 1/2] object.c: free replace map in raw_object_store_clear Stefan Beller
2018-05-10 10:16 0% ` Junio C Hamano
2018-05-10 17:23 0% ` Stefan Beller
2018-05-19 2:06 5% [PATCH 0/5] merge-recursive code cleanups Elijah Newren
2018-05-22 0:43 4% ` [PATCH v2 " Elijah Newren
2018-06-19 22:07 7% The state of the object store series Stefan Beller
2018-06-22 0:59 0% ` Derrick Stolee
2018-06-29 1:21 6% [PATCH v3 00/32] object-store: lookup_commit Stefan Beller
2018-06-29 14:53 0% ` Derrick Stolee
2018-06-29 17:57 0% ` Junio C Hamano
2018-07-11 19:02 5% What's cooking in git.git (Jul 2018, #01; Wed, 11) Junio C Hamano
2018-07-18 22:03 5% What's cooking in git.git (Jul 2018, #02; Wed, 18) Junio C Hamano
2018-07-25 22:13 5% What's cooking in git.git (Jul 2018, #03; Wed, 25) Junio C Hamano
2018-08-02 23:02 4% What's cooking in git.git (Aug 2018, #01; Thu, 2) Junio C Hamano
2018-08-26 10:02 [PATCH 00/21] Kill the_index part 4 Nguyễn Thái Ngọc Duy
2018-08-27 17:32 5% ` Stefan Beller
2018-08-28 19:32 0% ` Duy Nguyen
2018-12-31 23:57 [PATCH] doc: remove unneeded TODO for release_commit_memory Albert Burt
2019-01-01 10:40 4% ` Duy Nguyen
2019-01-01 20:08 4% ` [PATCH v2] " Albert Burt
2019-01-02 11:17 0% ` Duy Nguyen
2019-01-03 7:21 0% ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).