summaryrefslogtreecommitdiff
path: root/connected.h
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2018-07-02 22:08:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 21:57:44 (GMT)
commitcf1e7c07705eb21c30d0ee414810e7bc8fdf7d82 (patch)
treedb2515073445cc5b9fdb89f6472f91ed8505a59c /connected.h
parent733020517a1baa6f4f76bb7bf48d8d8d14eecd6c (diff)
downloadgit-cf1e7c07705eb21c30d0ee414810e7bc8fdf7d82.zip
git-cf1e7c07705eb21c30d0ee414810e7bc8fdf7d82.tar.gz
git-cf1e7c07705eb21c30d0ee414810e7bc8fdf7d82.tar.bz2
fetch-pack: write shallow, then check connectivity
When fetching, connectivity is checked after the shallow file is updated. There are 2 issues with this: (1) the connectivity check is only performed up to ancestors of existing refs (which is not thorough enough if we were deepening an existing ref in the first place), and (2) there is no rollback of the shallow file if the connectivity check fails. To solve (1), update the connectivity check to check the ancestry chain completely in the case of a deepening fetch by refraining from passing "--not --all" when invoking rev-list in connected.c. To solve (2), have fetch_pack() perform its own connectivity check before updating the shallow file. To support existing use cases in which "git fetch-pack" is used to download objects without much regard as to the connectivity of the resulting objects with respect to the existing repository, the connectivity check is only done if necessary (that is, the fetch is not a clone, and the fetch involves shallow/deepen functionality). "git fetch" still performs its own connectivity check, preserving correctness but sometimes performing redundant work. This redundancy is mitigated by the fact that fetch_pack() reports if it has performed a connectivity check itself, and if the transport supports connect or stateless-connect, it will bubble up that report so that "git fetch" knows not to perform the connectivity check in such a case. This was noticed when a user tried to deepen an existing repository by fetching with --no-shallow from a server that did not send all necessary objects - the connectivity check as run by "git fetch" succeeded, but a subsequent "git fsck" failed. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connected.h')
-rw-r--r--connected.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/connected.h b/connected.h
index a53f03a..322dc76 100644
--- a/connected.h
+++ b/connected.h
@@ -38,6 +38,13 @@ struct check_connected_options {
* Insert these variables into the environment of the child process.
*/
const char **env;
+
+ /*
+ * If non-zero, check the ancestry chain completely, not stopping at
+ * any existing ref. This is necessary when deepening existing refs
+ * during a fetch.
+ */
+ unsigned is_deepening_fetch : 1;
};
#define CHECK_CONNECTED_INIT { 0 }