diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-12-05 13:02:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-11 00:14:17 (GMT) |
| commit | 79d3a236c551ad59719a6835bee03a1446296e65 (patch) | |
| tree | a23554e47b3d83df429dda8e9fbe7c33a1b8cb58 /Documentation/fetch-options.txt | |
| parent | 4820a33baa963c4559736d7a1c4c35f8dcb37293 (diff) | |
| download | git-79d3a236c551ad59719a6835bee03a1446296e65.zip git-79d3a236c551ad59719a6835bee03a1446296e65.tar.gz git-79d3a236c551ad59719a6835bee03a1446296e65.tar.bz2 | |
upload-pack: make sure deepening preserves shallow roots
When "fetch --depth=N" where N exceeds the longest chain of history in
the source repo, usually we just send an "unshallow" line to the
client so full history is obtained.
When the source repo is shallow we need to make sure to "unshallow"
the current shallow point _and_ "shallow" again when the commit
reaches its shallow bottom in the source repo.
This should fix both cases: large <N> and --unshallow.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
| -rw-r--r-- | Documentation/fetch-options.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index ba1fe49..a83d2b4 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -14,8 +14,12 @@ branch history. Tags for the deepened commits are not fetched. --unshallow:: - Convert a shallow repository to a complete one, removing all - the limitations imposed by shallow repositories. + If the source repository is complete, convert a shallow + repository to a complete one, removing all the limitations + imposed by shallow repositories. ++ +If the source repository is shallow, fetch as much as possible so that +the current repository has the same history as the source repository. ifndef::git-pull[] --dry-run:: |