user/sven/git.git/shallow.c, branch v2.26.0-rc2

Merge branch 'rs/dedup-includes'

2019-10-11T05:24:48Z

Code cleanup. * rs/dedup-includes: treewide: remove duplicate #include directives

Merge branch 'as/shallow-slab-use-fix'

2019-10-09T05:00:59Z

Correct code that tried to reference all entries in a sparse array of pointers by mistake. * as/shallow-slab-use-fix: shallow.c: don't free unallocated slabs

treewide: remove duplicate #include directives

2019-10-03T23:16:00Z

Found with "git grep '^#include ' '*.c' | sort | uniq -d". Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

shallow.c: don't free unallocated slabs

2019-10-02T06:03:47Z

Fix possible segfault when cloning a submodule shallow. Signed-off-by: Ali Utku Selen Signed-off-by: Junio C Hamano

Use the right 'struct repository' instead of the_repository

2019-06-27T19:45:17Z

There are a couple of places where 'struct repository' is already passed around, but the_repository is still used. Use the right repo. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

fetch-pack: do not take shallow lock unnecessarily

2019-01-10T22:53:35Z

When fetching using protocol v2, the remote may send a "shallow-info" section if the client is shallow. If so, Git as the client currently takes the shallow file lock, even if the "shallow-info" section is empty. This is not a problem except that Git does not support taking the shallow file lock after modifying the shallow file, because is_repository_shallow() stores information that is never cleared. And this take-after-modify occurs when Git does a tag-following fetch from a shallow repository on a transport that does not support tag following (since in this case, 2 fetches are performed). To solve this issue, take the shallow file lock (and perform all other shallow processing) only if the "shallow-info" section is non-empty; otherwise, behave as if it were empty. A full solution (probably, ensuring that any action of committing shallow file locks also includes clearing the information stored by is_repository_shallow()) would solve the issue without need for this patch, but this patch is independently useful (as an optimization to prevent writing a file in an unnecessary case), hence why I wrote it. I have included a NEEDSWORK outlining the full solution. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

Merge branch 'js/shallow-and-fetch-prune'

2018-11-06T06:50:18Z

"git repack" in a shallow clone did not correctly update the shallow points in the repository, leading to a repository that does not pass fsck. * js/shallow-and-fetch-prune: repack -ad: prune the list of shallow commits shallow: offer to prune only non-existing entries repack: point out a bug handling stale shallow info

shallow: offer to prune only non-existing entries

2018-10-25T03:59:27Z

The `prune_shallow()` function wants a full reachability check to be completed before it goes to work, to ensure that all unreachable entries are removed from the shallow file. However, in the upcoming patch we do not even want to go that far. We really only need to remove entries corresponding to pruned commits, i.e. to commits that no longer exist. Let's support that use case. Rather than extending the signature of `prune_shallow()` to accept another Boolean, let's turn it into a bit field and declare constants, for readability. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'nd/the-index'

2018-10-19T04:34:02Z

Various codepaths in the core-ish part learn to work on an arbitrary in-core index structure, not necessarily the default instance "the_index". * nd/the-index: (23 commits) revision.c: reduce implicit dependency the_repository revision.c: remove implicit dependency on the_index ws.c: remove implicit dependency on the_index tree-diff.c: remove implicit dependency on the_index submodule.c: remove implicit dependency on the_index line-range.c: remove implicit dependency on the_index userdiff.c: remove implicit dependency on the_index rerere.c: remove implicit dependency on the_index sha1-file.c: remove implicit dependency on the_index patch-ids.c: remove implicit dependency on the_index merge.c: remove implicit dependency on the_index merge-blobs.c: remove implicit dependency on the_index ll-merge.c: remove implicit dependency on the_index diff-lib.c: remove implicit dependency on the_index read-cache.c: remove implicit dependency on the_index diff.c: remove implicit dependency on the_index grep.c: remove implicit dependency on the_index diff.c: remove the_index dependency in textconv() functions blame.c: rename "repo" argument to "r" combine-diff.c: remove implicit dependency on the_index ...

revision.c: remove implicit dependency on the_index

2018-09-21T16:51:19Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano