# [MERGE] Combine git-tools repository into example-tools/ subdirectory of git

2 messages from 2005-07-16 to 2005-07-16. Participants: Ryan Anderson, Linus Torvalds.
Thread: https://gitlist.dev/t/1257

## Ryan Anderson, 2005-07-16 07:55

Subject: [MERGE] Combine git-tools repository into example-tools/ subdirectory of git
Message-ID: <20050716075553.GI20369@mythryan2.michonline.com>
URL: https://gitlist.dev/e/20050716075553.GI20369%40mythryan2.michonline.com

```

Linus, it seems, well, odd to me that you maintain two different git
trees.

So I used your example of the gittk merge to move git-tools into the
main git-repository.

Summary of changes:
1) Create an example-tools directory

2) Move all of the git-tools tree, except the outdated cvs2git script
into this directory.

3) Rename dotest to applymbox

4) Minor cleanup inside applymbox of comments to apply to the new name.

Given that I don't think anyone wants to look at the diff of this, with
all the git history involved, I have a git tree up at:

	rsync://h4x0r5.com::git-ryan.git/

-- 

Ryan Anderson
  sometimes Pug Majere

```

## Linus Torvalds, 2005-07-16 17:19

Subject: Re: [MERGE] Combine git-tools repository into example-tools/ subdirectory of git
Message-ID: <Pine.LNX.4.58.0507161015230.19183@g5.osdl.org>
URL: https://gitlist.dev/e/Pine.LNX.4.58.0507161015230.19183%40g5.osdl.org
In-Reply-To: <20050716075553.GI20369@mythryan2.michonline.com>

```


On Sat, 16 Jul 2005, Ryan Anderson wrote:
> 
> Linus, it seems, well, odd to me that you maintain two different git
> trees.

Yes.

> So I used your example of the gittk merge to move git-tools into the
> main git-repository.

Fair enough. I was ready to pull your work, but it turns out that the old 
git-tools repository had things like directory entries with file mode 
100775, so git-fsck-cache complains about it. I've already suppressed 
git-fsck-cache on mode 100664 (which exists in both the kernel and git 
archives), so I could have just added the other case, but I preferred to 
just make git-convert-cache convert it, and then pull in a _converted_ 
tools archive instead.

[ Side note: I'm actually happy by how git-convert-cache was still 100%
  functional.  I haven't touched it in a long time, and it's very intimate
  with the objects, so the fact that it still worked means that we haven't 
  screwed anything up in the object format ;]

I did mostly the same things you did, except I also dropped "stripspace",
since I'd already copied it over to git (and it's now installed as
"git-stripspace") earlier. And I just called the subdirectory "tools".

		Linus

```