threads / patch / 11909

patchINSTALL: git-merge no longer uses cpio

Subject: [PATCH] INSTALL: git-merge no longer uses cpio

## tl;dr

3 messages between Feb 6, 2008 and Feb 6, 2008. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Gerrit Pape· Feb 6, 2008, 07:03 UTC · lore

Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio anymore, adapt the documentation.

Signed-off-by: Gerrit Pape <pape@smarden.org>
---
 INSTALL |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to INSTALL +2 −2

diff --git a/INSTALL b/INSTALL
index f1eb404..6f3bcb4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,8 +79,8 @@ Issues of note:
 	- "perl" and POSIX-compliant shells are needed to use most of
 	  the barebone Porcelainish scripts.
 
-	- "cpio" is used by git-merge for saving and restoring the index,
-	  and by git-clone when doing a local (possibly hardlinked) clone.
+	- "cpio" is used by git-clone when doing a local (possibly
+	  hardlinked) clone.
 
  - Some platform specific issues are dealt with Makefile rules,
    but depending on your specific installation, you may not

-- 
1.5.4

Johannes Schindelin· Feb 6, 2008, 22:46 UTC · re: Gerrit Pape · lore

Re: [PATCH] INSTALL: git-merge no longer uses cpio

Hi,

On Wed, 6 Feb 2008, Gerrit Pape wrote:

> Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio
> anymore, adapt the documentation.

$ git grep cpio | cut -c1-60
INSTALL:        - "cpio" is used by git-merge for saving and restor
git-clone.sh:           find objects -depth -print | cpio -pumd$l "$G
git-gui/Makefile:INSTALL_A1 = | cpio -pud
git-gui/Makefile:       INSTALL_A1 = && echo '   ' INSTALL '   ' `

So it seems that git-clone still relies on it.

Ciao, Dscho

Mike Hommey· Feb 6, 2008, 22:55 UTC · re: Johannes Schindelin · lore

Re: [PATCH] INSTALL: git-merge no longer uses cpio

On Wed, Feb 06, 2008 at 10:46:12PM +0000, Johannes Schindelin wrote:

Show 14 quoted lines

> Hi,
> 
> On Wed, 6 Feb 2008, Gerrit Pape wrote:
> 
> > Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio
> > anymore, adapt the documentation.
> 
> $ git grep cpio | cut -c1-60
> INSTALL:        - "cpio" is used by git-merge for saving and restor
> git-clone.sh:           find objects -depth -print | cpio -pumd$l "$G
> git-gui/Makefile:INSTALL_A1 = | cpio -pud
> git-gui/Makefile:       INSTALL_A1 = && echo '   ' INSTALL '   ' `
> 
> So it seems that git-clone still relies on it.

BTW, is there a topic-branch somewhere with a reimplementation of git-clone in C ?

Mike