* Re: git and binary files
From: Petko Manolov @ 2008-01-16 13:39 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <alpine.LSU.1.00.0801161113170.17650@racer.site>
On Wed, 16 Jan 2008, Johannes Schindelin wrote:
> Your subject is a little bit misleading, no? It's not about the
> binariness (git handles binary files just fine, thankyouverymuch), but
> about the not-tracking them.
You're absobloodylutely correct. I was too preoccupied defining my problem
in a better way, which left the subject kind of dumb. Well, quite dumb.
:-)
> The answer is no. You cannot ask git to have the newest version of
> something, but not the old ones. It contradicts the distributedness of
> git, too.
I don't agree here. Assume that whatever you're working on require
firmware for a device that won't change during the lifetime of the
software project. The newest version of the said firmware is mostly
bugfixes and you basically don't want to revert to the older ones.
Consider the microcode for modern Pentiums, Core 2, etc.
What i am trying to suggest is that there might be cases when you need
something in the repository, but you don't want GIT to keep it's history
nor it's predecessors. Leaving it out breaks the atomicity of such
repository and makes the project management more complex.
There's a few examples out there that shows how to solve this, but it
seems inconvenient and involves branching, cloning, etc. Isn't it
possible to add something like:
"git nohistory firmware.bin"
or
"git nohistory -i-understand-this-might-be-dangerous firmware.bin"
cheers,
Petko
^ permalink raw reply
* Re: git-svn: Internal error during fetch of mono repository
From: Mark Junker @ 2008-01-16 13:23 UTC (permalink / raw)
To: git
In-Reply-To: <878x2qaq4u.fsf@hariville.hurrynot.org>
Raja R Harinath schrieb:
> (01:25:24 IST) hubert_yub: when updating mono svn :
> (01:25:30 IST) hubert_yub: hubert@hublinux /home/hubert/mono $ svn up mono
> (01:25:31 IST) hubert_yub: svn: Can't find a temporary directory
> (01:28:21 IST) hubert_yub: on anonsvn
>
>> Is his problem solved?
>
> No idea :-)
Thank you for posting this part of the IRC log. It really seems to be
the same error message. I guess I have to wait until this problem gets
solved.
Regards,
Mark
^ permalink raw reply
* Re: git and binary files
From: Petko Manolov @ 2008-01-16 13:21 UTC (permalink / raw)
To: David Symonds; +Cc: git
In-Reply-To: <ee77f5c20801160254u53e07773qb4125ffd90cf7619@mail.gmail.com>
On Wed, 16 Jan 2008, David Symonds wrote:
> If you don't care about versioning those files, why would you use a
> version control system? Just store them somewhere else, and use
> symlinks.
That is certainly a way of doing it. However, it will be much simpler and
fast to be able to "git clone" and then "git pull" every once in a while.
The alternative involves "cp -a" or most likely "scp -r" the binaries
along with the repository and you can never be sure that both are in sync.
Petko
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Bert Wesarg @ 2008-01-16 13:21 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Mike, git
In-Reply-To: <alpine.LNX.1.00.0801152305050.13593@iabervon.org>
On Jan 16, 2008 5:13 AM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> On Tue, 15 Jan 2008, Mike wrote:
>
> > How do I make the repository dir live somewhere else, the hell away from my
> > code? Thanks
>
> export GIT_DIR=/somewhere-else.git
>
> Note that this only really works if you've only got one repository;
> there's no good way to have the repository information outside of the
> working directory and still have which repository you're using depend on
> which directory you're working in.
This project may solve this problem:
http://swapoff.org/OnDir
Bert
>
> -Daniel
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Jakub Narebski @ 2008-01-16 13:13 UTC (permalink / raw)
To: Mike; +Cc: git
In-Reply-To: <478D79BD.7060006@talkingspider.com>
Mike <fromlists@talkingspider.com> writes:
> I'm learning git and I'm really annoyed that the .git directory lives
> in the same directory as my code. I don't want it there for three
> reasons:
>
> 1. My code lives on a development web server docroot, and I don't want
> the .git repository to end up getting published to the live site by
> accident. (I would imagine this would be a common need.)
Use git-archive (or, in older releases, git-tar-tree) and perhaps
post-update / post-recieve hook to publish latest version.
I think best layout would be:
(1) your private copy (clone) of repository, with working directory
(2) bare (without working directory) publishing repository,
with post-update hook
(3) published last version of your files
You can check 'todo' branch of git.git repository for scripts which
Junio uses to automatically update git HTML documentation at
kernel.org
> 2. If I tar/gz my code and deliver it to a client, I don't want the
> .git dir slipping into the tarball, allowing my client to be able to
> peruse the history of what we did and when.
Use git-archive / git-tar-tree to tar.gz or zip code to send to client.
This has the advantage of not packing generated code, backup files,
etc., not only .git. Besides there is --exclude option to tar ;-)
(For RPM based distributions git-archive is usually in git-core;
I don't know what package you have to install on Debian based distro).
> 3. The .git respository will get big, especially with binary files in
> it, and I want it someplace with a lot of disk space. And I don't want
> it to get tarred up when we migrate the site to a different
> server. (And tar isn't aware of hard links is it? wonderful.)
>
> How do I make the repository dir live somewhere else, the hell away
> from my code? Thanks
If you are inside repo, configuration variable core.worktree,
environmental variable GIT_WORK_DIR, or '--work-tree' command line
option (git --work-tree=/path/to/working/dir <cmd>) can be used to
point to working tree.
If you are in working area, environmental variable GIT_DIR, or
'--git-dir' command line option can be used to point to the
repository. You can also symlink .git in working directory.
There was an idea of '.gitlink' file, similar to CVS/Root file
in CVS, or core.gitdir configuration variable which points to
base GIT_DIR in unionfs / shadow like way, but neither got
implemented. You are welcome to it... of course after release :-)
--
Jakub Narebski
Poland
ShadeHawk on #git
^ permalink raw reply
* Re: git-svn: Internal error during fetch of mono repository
From: Raja R Harinath @ 2008-01-16 12:53 UTC (permalink / raw)
To: git
In-Reply-To: <478DF4FE.8010204@web.de>
Hi,
Mark Junker <mjscod@web.de> writes:
> Raja R Harinath schrieb:
>
>> It's probably an issue with anonsvn.mono-project.com: maybe run out of
>> space on /tmp. I remember someone else complaining about it on #mono
>> this morning.
>
> Did he get the same error message?
(01:25:24 IST) hubert_yub: when updating mono svn :
(01:25:30 IST) hubert_yub: hubert@hublinux /home/hubert/mono $ svn up mono
(01:25:31 IST) hubert_yub: svn: Can't find a temporary directory
(01:28:21 IST) hubert_yub: on anonsvn
> Is his problem solved?
No idea :-)
- Hari
^ permalink raw reply
* [PATCH] Correct spelling in diff.c comment
From: Bill Lear @ 2008-01-16 12:46 UTC (permalink / raw)
To: git; +Cc: Bill Lear
Correct a spelling mistake in a comment.
Signed-off-by: Bill Lear <rael@zopyra.com>
---
diff.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c
index b18c140..9ee0c41 100644
--- a/diff.c
+++ b/diff.c
@@ -1224,7 +1224,7 @@ static const char *diff_funcname_pattern(struct diff_filespec *one)
/*
* And define built-in fallback patterns here. Note that
- * these can be overriden by the user's config settings.
+ * these can be overridden by the user's config settings.
*/
for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
if (!strcmp(ident, builtin_funcname_pattern[i].name))
--
gitgui.0.8.4.g9c514
^ permalink raw reply related
* Re: I don't want the .git directory next to my code.
From: Johannes Schindelin @ 2008-01-16 12:45 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Bill Lear, Mike, git
In-Reply-To: <vpq4pderm7k.fsf@bauges.imag.fr>
Hi,
On Wed, 16 Jan 2008, Matthieu Moy wrote:
> Bill Lear <rael@zopyra.com> writes:
>
> > On Wednesday, January 16, 2008 at 10:36:34 (+0000) Johannes Schindelin writes:
> >>Hi,
> >>
> >>On Wed, 16 Jan 2008, Matthieu Moy wrote:
> >>
> >>> Mike <fromlists@talkingspider.com> writes:
> >>>
> >>> > I'm learning git and I'm really annoyed that the .git directory lives
> >>> > in the same directory as my code. I don't want it there for three
> >>> > reasons:
> >>>
> >>> The idea was discussed here, mostly under the name "gitlink".
> >>
> >>It goes by "git worktree"; has nothing to do with gitlink (which has
> >>something to do with submodules).
> >
> > I think you mean to say there is a variable 'worktree' variable
> > available via the config variable 'core.worktree' or environment
> > variable GIT_WORK_TREE, or command-line option --work-tree that should
> > do the trick (no 'git worktree' command exists as far as I can see):
>
> Yes, so you can use
>
> $ git --work-tree . --git-dir /some/other/place <some-command>
>
> But it's far from the user-friendlyness of a real lightweight checkout:
> you need to provide the --work-tree and --git-dir options each time you
> run git. And making an alias or using the environment variables are not
> really an option if you have more than one repository or working tree to
> deal with.
Well, the OP said he did not want _any_ file in the worktree. So there's
no way around specifying by hand everytime where the git directory should
be.
I'm not saying I find the OP's restrictions sensible, but that's what he
said.
Ciao,
Dscho
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Matthieu Moy @ 2008-01-16 12:25 UTC (permalink / raw)
To: Bill Lear; +Cc: Johannes Schindelin, Mike, git
In-Reply-To: <18317.60797.644829.539598@lisa.zopyra.com>
Bill Lear <rael@zopyra.com> writes:
> On Wednesday, January 16, 2008 at 10:36:34 (+0000) Johannes Schindelin writes:
>>Hi,
>>
>>On Wed, 16 Jan 2008, Matthieu Moy wrote:
>>
>>> Mike <fromlists@talkingspider.com> writes:
>>>
>>> > I'm learning git and I'm really annoyed that the .git directory lives
>>> > in the same directory as my code. I don't want it there for three
>>> > reasons:
>>>
>>> The idea was discussed here, mostly under the name "gitlink".
>>
>>It goes by "git worktree"; has nothing to do with gitlink (which has
>>something to do with submodules).
>
> I think you mean to say there is a variable 'worktree' variable
> available via the config variable 'core.worktree' or environment
> variable GIT_WORK_TREE, or command-line option --work-tree that should
> do the trick (no 'git worktree' command exists as far as I can see):
Yes, so you can use
$ git --work-tree . --git-dir /some/other/place <some-command>
But it's far from the user-friendlyness of a real lightweight
checkout: you need to provide the --work-tree and --git-dir options
each time you run git. And making an alias or using the environment
variables are not really an option if you have more than one
repository or working tree to deal with.
--
Matthieu
^ permalink raw reply
* Re: git-svn: Internal error during fetch of mono repository
From: Mark Junker @ 2008-01-16 12:13 UTC (permalink / raw)
To: git
In-Reply-To: <87d4s2qa93.fsf@hariville.hurrynot.org>
Raja R Harinath schrieb:
> It's probably an issue with anonsvn.mono-project.com: maybe run out of
> space on /tmp. I remember someone else complaining about it on #mono
> this morning.
Did he get the same error message? Is his problem solved?
Regards,
Mark
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Johannes Schindelin @ 2008-01-16 12:12 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Mike, git
In-Reply-To: <vpqd4s2rng9.fsf@bauges.imag.fr>
Hi,
On Wed, 16 Jan 2008, Matthieu Moy wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Wed, 16 Jan 2008, Matthieu Moy wrote:
> >
> >> Mike <fromlists@talkingspider.com> writes:
> >>
> >> > I'm learning git and I'm really annoyed that the .git directory
> >> > lives in the same directory as my code. I don't want it there for
> >> > three reasons:
> >>
> >> The idea was discussed here, mostly under the name "gitlink".
> >
> > It goes by "git worktree";
>
> Any pointer to some doc? My git doesn't have a "worktree" command.
I was not talking about a command. I prepended "git" only to stress that
this worktree is not any worktree, but integrated into git. I believe
Bill has already given all necessary pointers.
> > has nothing to do with gitlink (which has something to do with
> > submodules).
>
> We may not be talking about the same gitlink then.
Indeed.
Ciao,
Dscho
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Matthieu Moy @ 2008-01-16 11:59 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Mike, git
In-Reply-To: <alpine.LSU.1.00.0801161035380.17650@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Hi,
>
> On Wed, 16 Jan 2008, Matthieu Moy wrote:
>
>> Mike <fromlists@talkingspider.com> writes:
>>
>> > I'm learning git and I'm really annoyed that the .git directory lives
>> > in the same directory as my code. I don't want it there for three
>> > reasons:
>>
>> The idea was discussed here, mostly under the name "gitlink".
>
> It goes by "git worktree";
Any pointer to some doc? My git doesn't have a "worktree" command.
> has nothing to do with gitlink (which has something to do with
> submodules).
We may not be talking about the same gitlink then.
The one I'm refering to is "Lightweight Checkout
Otherwise known as the .gitlink idea." on
http://git.or.cz/gitwiki/SoC2007Ideas for example.
--
Matthieu
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Bill Lear @ 2008-01-16 11:41 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Matthieu Moy, Mike, git
In-Reply-To: <alpine.LSU.1.00.0801161035380.17650@racer.site>
On Wednesday, January 16, 2008 at 10:36:34 (+0000) Johannes Schindelin writes:
>Hi,
>
>On Wed, 16 Jan 2008, Matthieu Moy wrote:
>
>> Mike <fromlists@talkingspider.com> writes:
>>
>> > I'm learning git and I'm really annoyed that the .git directory lives
>> > in the same directory as my code. I don't want it there for three
>> > reasons:
>>
>> The idea was discussed here, mostly under the name "gitlink".
>
>It goes by "git worktree"; has nothing to do with gitlink (which has
>something to do with submodules).
I think you mean to say there is a variable 'worktree' variable
available via the config variable 'core.worktree' or environment
variable GIT_WORK_TREE, or command-line option --work-tree that should
do the trick (no 'git worktree' command exists as far as I can see):
% man git-config
[...]
core.worktree
Set the path to the working tree. The value will not be used in
combination with repositories found automatically in a .git
directory (i.e. $GIT_DIR is not set). This can be overriden by the
GIT_WORK_TREE environment variable and the --work-tree command line
option.
[...]
% man git
[...]
--work-tree=<path>
Set the path to the working tree. The value will not be used in
combination with repositories found automatically in a .git
directory (i.e. $GIT_DIR is not set). This can also be controlled
by setting the GIT_WORK_TREE environment variable and the
core.worktree configuration variable.
[...]
Bill
^ permalink raw reply
* Re: git and binary files
From: Johannes Schindelin @ 2008-01-16 11:54 UTC (permalink / raw)
To: Petko Manolov; +Cc: git
In-Reply-To: <alpine.DEB.1.00.0801161222150.3889@bender.nucleusys.com>
Hi,
On Wed, 16 Jan 2008, Petko Manolov wrote:
> Some of my projects require having binary files (firmware and other
> stuff) somewhere in the tree structure. Unfortunately these files are
> big - 50MB and more. After a couple of new versions arrive (and get
> committed) i end up with a repository way too big than necessary.
>
> The nature of these binary files is such that i don't care neither about
> their history nor older versions. Hence the question: is there an easy
> way to tell git not to bother about the history of these particular
> files and keep the most recent version only?
Your subject is a little bit misleading, no? It's not about the
binariness (git handles binary files just fine, thankyouverymuch), but
about the not-tracking them.
The answer is no. You cannot ask git to have the newest version of
something, but not the old ones. It contradicts the distributedness of
git, too.
Hth,
Dscho
^ permalink raw reply
* Re: git-svn: Internal error during fetch of mono repository
From: Raja R Harinath @ 2008-01-16 11:29 UTC (permalink / raw)
To: git
In-Reply-To: <478DDEED.8050906@web.de>
Hi,
Mark Junker <mjscod@web.de> writes:
> I got an internal error during fetch of the mono repository. I attach
> both the messages produces by the git-fetch and the .git/config.
>
> My git version is 1.5.3.7. The svn version is 1.4.6.
>
> Any idea?
>
> Regards,
> Mark
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> [svn-remote "svn"]
> url = svn://anonsvn.mono-project.com/source
> fetch = trunk:refs/remotes/trunk
> branches = branches/*:refs/remotes/*
> tags = tags/*:refs/remotes/tags/*
> Index mismatch: 9291cf59c6f5894845fba03df4784872b52ab75b != 5f732c31a4bb780618de031375ea6f319760cea6
> rereading ce0cc5a032fa7b1926128df5bb751bf00303e0b8
> Found possible branch point: svn://anonsvn.mono-project.com/source/trunk/debugger => svn://anonsvn.mono-project.com/source/tags/MONO_DEBUGGER_0_10, 45924
> Initializing parent: tags/MONO_DEBUGGER_0_10@45924
> Found branch parent: (tags/MONO_DEBUGGER_0_10) d8c5b5d8412e4bfe4064858a0d94258b770903dd
> Index mismatch: 5f732c31a4bb780618de031375ea6f319760cea6 != 9291cf59c6f5894845fba03df4784872b52ab75b
> rereading d8c5b5d8412e4bfe4064858a0d94258b770903dd
> Following parent with do_switch
> Internal error: Can't find a temporary directory at /opt/local/bin/git-svn line 3227
It's probably an issue with anonsvn.mono-project.com: maybe run out of
space on /tmp. I remember someone else complaining about it on #mono
this morning.
- Hari
^ permalink raw reply
* git-svn: Internal error during fetch of mono repository
From: Mark Junker @ 2008-01-16 11:33 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
Hi,
I got an internal error during fetch of the mono repository. I attach
both the messages produces by the git-fetch and the .git/config.
My git version is 1.5.3.7. The svn version is 1.4.6.
Any idea?
Regards,
Mark
[-- Attachment #2: config --]
[-- Type: text/plain, Size: 264 bytes --]
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[svn-remote "svn"]
url = svn://anonsvn.mono-project.com/source
fetch = trunk:refs/remotes/trunk
branches = branches/*:refs/remotes/*
tags = tags/*:refs/remotes/tags/*
[-- Attachment #3: git-svn-error.txt --]
[-- Type: text/plain, Size: 713 bytes --]
Index mismatch: 9291cf59c6f5894845fba03df4784872b52ab75b != 5f732c31a4bb780618de031375ea6f319760cea6\rrereading ce0cc5a032fa7b1926128df5bb751bf00303e0b8\rFound possible branch point: svn://anonsvn.mono-project.com/source/trunk/debugger => svn://anonsvn.mono-project.com/source/tags/MONO_DEBUGGER_0_10, 45924\rInitializing parent: tags/MONO_DEBUGGER_0_10@45924\rFound branch parent: (tags/MONO_DEBUGGER_0_10) d8c5b5d8412e4bfe4064858a0d94258b770903dd\rIndex mismatch: 5f732c31a4bb780618de031375ea6f319760cea6 != 9291cf59c6f5894845fba03df4784872b52ab75b\rrereading d8c5b5d8412e4bfe4064858a0d94258b770903dd\rFollowing parent with do_switch\rInternal error: Can't find a temporary directory at /opt/local/bin/git-svn line 3227
^ permalink raw reply
* Re: git and binary files
From: David Symonds @ 2008-01-16 10:54 UTC (permalink / raw)
To: Petko Manolov; +Cc: git
In-Reply-To: <alpine.DEB.1.00.0801161222150.3889@bender.nucleusys.com>
On Jan 16, 2008 9:34 PM, Petko Manolov <petkan@nucleusys.com> wrote:
>
> The nature of these binary files is such that i don't care neither about
> their history nor older versions. Hence the question: is there an easy
> way to tell git not to bother about the history of these particular files
> and keep the most recent version only?
If you don't care about versioning those files, why would you use a
version control system? Just store them somewhere else, and use
symlinks.
Dave.
^ permalink raw reply
* git and binary files
From: Petko Manolov @ 2008-01-16 10:34 UTC (permalink / raw)
To: git
Hello there,
I've searched the web for an answer, but i didn't find it and decided to
take the risk of being yelled at. And post it here.
Some of my projects require having binary files (firmware and other stuff)
somewhere in the tree structure. Unfortunately these files are big - 50MB
and more. After a couple of new versions arrive (and get committed) i end
up with a repository way too big than necessary.
The nature of these binary files is such that i don't care neither about
their history nor older versions. Hence the question: is there an easy
way to tell git not to bother about the history of these particular files
and keep the most recent version only?
cheers,
Petko
^ permalink raw reply
* git-svn: Internal error during fetch of mono repository
From: Mark Junker @ 2008-01-16 10:39 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
Hi,
I got an internal error during fetch of the mono repository. I attach
both the messages produces by the git-fetch and the .git/config.
My git version is 1.5.3.7. The svn version is 1.4.6.
Any idea?
Regards,
Mark
[-- Attachment #2: config --]
[-- Type: text/plain, Size: 263 bytes --]
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[svn-remote "svn"]
url = svn://anonsvn.mono-project.com/source
fetch = trunk:refs/remotes/trunk
branches = branches/*:refs/remotes/*
tags = tags/*:refs/remotes/tags/*
[-- Attachment #3: git-svn-error.txt --]
[-- Type: text/plain, Size: 713 bytes --]
Index mismatch: 9291cf59c6f5894845fba03df4784872b52ab75b != 5f732c31a4bb780618de031375ea6f319760cea6\rrereading ce0cc5a032fa7b1926128df5bb751bf00303e0b8\rFound possible branch point: svn://anonsvn.mono-project.com/source/trunk/debugger => svn://anonsvn.mono-project.com/source/tags/MONO_DEBUGGER_0_10, 45924\rInitializing parent: tags/MONO_DEBUGGER_0_10@45924\rFound branch parent: (tags/MONO_DEBUGGER_0_10) d8c5b5d8412e4bfe4064858a0d94258b770903dd\rIndex mismatch: 5f732c31a4bb780618de031375ea6f319760cea6 != 9291cf59c6f5894845fba03df4784872b52ab75b\rrereading d8c5b5d8412e4bfe4064858a0d94258b770903dd\rFollowing parent with do_switch\rInternal error: Can't find a temporary directory at /opt/local/bin/git-svn line 3227
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Johannes Schindelin @ 2008-01-16 10:37 UTC (permalink / raw)
To: Mike; +Cc: Daniel Barkalow, git
In-Reply-To: <478D8717.50100@talkingspider.com>
Hi,
On Tue, 15 Jan 2008, Mike wrote:
> Daniel Barkalow wrote:
> > On Tue, 15 Jan 2008, Mike wrote:
> >
> > Generate your tarballs with "git archive", which will also make sure
> > that you don't accidentally include anything else that's not
> > committed. Likewise for sending to the live site, probably.
>
> Thanks please see my response to David about why this isn't good.
See Luke Lu's answer to your response about why you're wrong. It's even
in the man page of git-archive.
Hth,
Dscho
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Johannes Schindelin @ 2008-01-16 10:36 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Mike, git
In-Reply-To: <vpq4pdeum3v.fsf@bauges.imag.fr>
Hi,
On Wed, 16 Jan 2008, Matthieu Moy wrote:
> Mike <fromlists@talkingspider.com> writes:
>
> > I'm learning git and I'm really annoyed that the .git directory lives
> > in the same directory as my code. I don't want it there for three
> > reasons:
>
> The idea was discussed here, mostly under the name "gitlink".
It goes by "git worktree"; has nothing to do with gitlink (which has
something to do with submodules).
> But up to now, AFAIK, no one (including myself ;-) ) stepped-in to
> implement it.
It has been implemented, and it works.
Ciao,
Dscho
^ permalink raw reply
* Re: I don't want the .git directory next to my code.
From: Matthieu Moy @ 2008-01-16 9:59 UTC (permalink / raw)
To: Mike; +Cc: git
In-Reply-To: <478D79BD.7060006@talkingspider.com>
Mike <fromlists@talkingspider.com> writes:
> I'm learning git and I'm really annoyed that the .git directory lives
> in the same directory as my code. I don't want it there for three
> reasons:
The idea was discussed here, mostly under the name "gitlink". I'd like
it for another reason :
* Have my tree on a fast, unrelialbe local disk, and have my .git on a
slower, but safe and backed-up NFS partition.
But up to now, AFAIK, no one (including myself ;-) ) stepped-in to
implement it.
--
Matthieu
^ permalink raw reply
* Re: git-commit fatal: Out of memory? mmap failed: Bad file descriptor
From: Johannes Sixt @ 2008-01-16 7:53 UTC (permalink / raw)
To: Junio C Hamano
Cc: Linus Torvalds, Brandon Casey, Git Mailing List, drafnel,
Alex Riesen, Kristian Høgsberg
In-Reply-To: <7vzlv6d6sa.fsf@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
> While I think the ones that are immediately followed by
> commit_locked_index() can drop the close(fd) safely, I am not
> sure about Kristian's changes to the other ones that we
> currently close(fd) but do not commit nor rollback immediately.
> These indices are now shown to the hook with open fd to it if
> you choose not to close them. Is that okay for Windows guys? I
> somehow had an impression that the other process may have
> trouble accessing a file that is still open elsewhere for
> writing.
The trouble is that on Windows open files cannot be deleted or renamed.
Hence, if an index file remains open, the hooks won't be able to modify
them (because of the create-new-file-then-rename-over-old tactics).
> So I think the approach along the lines of your "hack" to close
> and tell lockfile API not to double-close is more appropriate.
> We would perhaps want "close_lock_file(struct lock_file *)" that
> calls close(lk->fd) and does lk->fd = -1 without rename/unlink,
> and replace these close() with that.
Yes!
-- Hannes
^ permalink raw reply
* Re: Git Cygwin - unable to create any repository - help!
From: Alex Riesen @ 2008-01-16 7:18 UTC (permalink / raw)
To: Robin Rosenberg; +Cc: Paul Umbers, git
In-Reply-To: <200801160002.51048.robin.rosenberg.lists@dewire.com>
Robin Rosenberg, Wed, Jan 16, 2008 00:02:49 +0100:
> tisdagen den 15 januari 2008 skrev Paul Umbers:
> > git ls (see below) returns nothing - it looks like the object doesn't
> > exist at all. I've attached a .zip of the entire test directory (one
> > text file plus .git). This is after "git init" followed by "git add ."
> >
> > What do you think?
>
> Git comes with test suite. Try it using make test or
He has just the precompiled packages from cygwin
> GIT_TEST_OPTS="--debug --verbose" make test
>
> The extra options are there since we expect it to fail.
>
But when compiled, it would be useflul indeed to see how the tests run
^ permalink raw reply
* [PATCH] Git Gui: add french glossary: glossary/fr.po
From: Christian Couder @ 2008-01-16 7:19 UTC (permalink / raw)
To: Shawn O. Pearce, Junio Hamano, Miklos Vajna; +Cc: git
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
po/glossary/fr.po | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 166 insertions(+), 0 deletions(-)
create mode 100644 po/glossary/fr.po
Here is another patch I pushed to the mob branch of git-gui-i18n.git.
Thanks.
diff --git a/po/glossary/fr.po b/po/glossary/fr.po
new file mode 100644
index 0000000..27c006a
--- /dev/null
+++ b/po/glossary/fr.po
@@ -0,0 +1,166 @@
+# translation of fr.po to French
+# Translation of git-gui glossary to French
+# Copyright (C) 2008 Shawn Pearce, et al.
+#
+# Christian Couder <chriscool@tuxfamily.org>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"POT-Creation-Date: 2008-01-15 21:04+0100\n"
+"PO-Revision-Date: 2008-01-15 21:17+0100\n"
+"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
+"Language-Team: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
+msgid "English Term (Dear translator: This file will never be visible to the user!)"
+msgstr ""
+
+#. ""
+msgid "amend"
+msgstr "corriger"
+
+#. ""
+msgid "annotate"
+msgstr "annoter"
+
+#. "A 'branch' is an active line of development."
+msgid "branch [noun]"
+msgstr "branche"
+
+#. ""
+msgid "branch [verb]"
+msgstr "créer une branche"
+
+#. ""
+msgid "checkout [noun]"
+msgstr "emprunt"
+
+#. "The action of updating the working tree to a revision which was stored in the object database."
+msgid "checkout [verb]"
+msgstr "emprunter"
+
+#. ""
+msgid "clone [verb]"
+msgstr "cloner"
+
+#. "A single point in the git history."
+msgid "commit [noun]"
+msgstr "commit"
+
+#. "The action of storing a new snapshot of the project's state in the git history."
+msgid "commit [verb]"
+msgstr "commiter"
+
+#. ""
+msgid "diff [noun]"
+msgstr "différence"
+
+#. ""
+msgid "diff [verb]"
+msgstr "comparer"
+
+#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+msgid "fast forward merge"
+msgstr "fusion par avance rapide"
+
+#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
+msgid "fetch"
+msgstr "récupérer"
+
+#. "A collection of files. The index is a stored version of your working tree."
+msgid "index (in git-gui: staging area)"
+msgstr "pré-commit"
+
+#. "A successful merge results in the creation of a new commit representing the result of the merge."
+msgid "merge [noun]"
+msgstr "fusion"
+
+#. "To bring the contents of another branch into the current branch."
+msgid "merge [verb]"
+msgstr "fusionner"
+
+#. ""
+msgid "message"
+msgstr "message"
+
+#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+msgid "prune"
+msgstr "nettoyer"
+
+#. "Pulling a branch means to fetch it and merge it."
+msgid "pull"
+msgstr "tirer"
+
+#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
+msgid "push"
+msgstr "pousser"
+
+#. ""
+msgid "redo"
+msgstr "refaire"
+
+#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote"
+msgstr "référentiel distant"
+
+#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
+msgid "repository"
+msgstr "référentiel"
+
+#. ""
+msgid "reset"
+msgstr "réinitialiser"
+
+#. ""
+msgid "revert"
+msgstr "inverser"
+
+#. "A particular state of files and directories which was stored in the object database."
+msgid "revision"
+msgstr "révision"
+
+#. ""
+msgid "sign off"
+msgstr "signer"
+
+#. ""
+msgid "staging area"
+msgstr "pré-commit"
+
+#. ""
+msgid "status"
+msgstr "état"
+
+#. "A ref pointing to a tag or commit object"
+msgid "tag [noun]"
+msgstr "marque"
+
+#. ""
+msgid "tag [verb]"
+msgstr "marquer"
+
+#. "A regular git branch that is used to follow changes from another repository."
+msgid "tracking branch"
+msgstr "branche de suivi"
+
+#. ""
+msgid "undo"
+msgstr "défaire"
+
+#. ""
+msgid "update"
+msgstr "mise à jour"
+
+#. ""
+msgid "verify"
+msgstr "vérifier"
+
+#. "The tree of actual checked out files."
+msgid "working copy, working tree"
+msgstr "copie de travail, arborescence de travail"
+
--
1.5.4.rc2.38.gd6da3
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox