threads / patch / 32496

patchCorrect example restore from bundle

Subject: [PATCH] Correct example restore from bundle

## tl;dr

4 messages between Jan 1, 2013 and Jan 1, 2013. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Kirill Brilliantov· Jan 1, 2013, 15:26 UTC · lore

Without use branche option repository restory without files: $ git clone pr.bundle q/ Cloning into 'q'... Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done. Resolving deltas: 100% (413/413), done. warning: remote HEAD refers to nonexistent ref, unable to checkout. $ ls -aF q/ ./ ../ .git/

Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov@inbox.ru>
---
 Documentation/git-bundle.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-bundle.txt +1 −1
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 16a6b0a..6c31715 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -118,7 +118,7 @@ were a remote repository instead of creating an empty repository and then
 pulling or fetching objects from the bundle:
 
 ----------------
-machineB$ git clone /home/me/tmp/file.bundle R2
+machineB$ git clone /home/me/tmp/file.bundle R2 -b master
 ----------------
 
 This will define a remote called "origin" in the resulting repository that

-- 
1.7.10.4
Junio C Hamano· Jan 1, 2013, 20:51 UTC · re: Kirill Brilliantov · lore

Re: [PATCH] Correct example restore from bundle

Kirill Brilliantov <brilliantov@inbox.ru> writes:
>  ----------------
> -machineB$ git clone /home/me/tmp/file.bundle R2
> +machineB$ git clone /home/me/tmp/file.bundle R2 -b master

I think the command line should follow the convention that is suggested in "git clone -h" output, i.e.

    git clone -b master /home/me/tmp/file.bundle R2

I also think 'git bundle create" should record HEAD that points at the only branch it is packing so the person who clones from it should not say which branch, and when that is done this patch will become unnecessary, but that is a separate topic.

Thanks; I'll queue this after rewording some.
-- >8 --
From: Kirill Brilliantov <brilliantov@inbox.ru>
Date: Tue, 1 Jan 2013 17:54:44 +0400
Subject: [PATCH] Documentation: correct example restore from bundle

Because the bundle created in the example does not record HEAD, "git clone" will not check out the files to the working tree:

    $ git clone pr.bundle q/
    Cloning into 'q'...
    Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done.
    Resolving deltas: 100% (413/413), done.
    warning: remote HEAD refers to nonexistent ref, unable to checkout.

Avoid alarming the readers by adding "-b master" to the example. A better fix may be to arrange the bundle created in the earlier step to record HEAD, so that it can be cloned without this workaround.

Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov@inbox.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-bundle.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-bundle.txt +1 −1
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 16a6b0a..5c8ba44 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -118,7 +118,7 @@ were a remote repository instead of creating an empty repository and then
 pulling or fetching objects from the bundle:
 
 ----------------
-machineB$ git clone /home/me/tmp/file.bundle R2
+machineB$ git clone -b master /home/me/tmp/file.bundle R2
 ----------------
 
 This will define a remote called "origin" in the resulting repository that

-- 
1.8.1.209.gc32ab23
Junio C Hamano· Jan 1, 2013, 21:07 UTC · re: Junio C Hamano · lore

[PATCH] Documentation: full-ness of a bundle is significant for cloning

Not necessarily every bundle file can be cloned from. Only the ones that do not need prerequisites can.

When 1d52b02 (Documentation: minor grammatical fixes and rewording in git-bundle.txt, 2009-03-22) reworded this paragraph, it lost a critical hint to tell readers why thhis particular bundle can be cloned from. Resurrect it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 * As I noticed this while I was looking at Kirill's patch...
 Documentation/git-bundle.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Show changes to Documentation/git-bundle.txt +3 −4
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 5c8ba44..bc023cc 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -112,10 +112,9 @@ machineA$ git bundle create file.bundle master
 machineA$ git tag -f lastR2bundle master
 ----------------
 
-Then you transfer file.bundle to the target machine B. If you are creating
-the repository on machine B, then you can clone from the bundle as if it
-were a remote repository instead of creating an empty repository and then
-pulling or fetching objects from the bundle:
+Then you transfer file.bundle to the target machine B. Because this
+bundle does not require any existing object to be extracted, you can
+create a new repository on machine B by cloning from it:
 
 ----------------
 machineB$ git clone -b master /home/me/tmp/file.bundle R2

-- 
1.8.1.209.gc32ab23
W. Trevor King· Jan 1, 2013, 21:08 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: full-ness of a bundle is significant for cloning

On Tue, Jan 01, 2013 at 01:07:05PM -0800, Junio C Hamano wrote:
> critical hint to tell readers why thhis particular bundle can be
s/thhis/this/

← back to recent threads