[PATCH] NUL terminate the object data in patch_delta()

2005-09-04 Thread Sergey Vlasov
At least pretty_print_commit() expects to get NUL-terminated commit data to work properly. unpack_sha1_rest(), which reads objects from separate files, and unpack_non_delta_entry(), which reads non-delta-compressed objects from pack files, already add the NUL byte after the object data, but

Re: Could not interpret heads/dbrt-test as something to pull

2005-09-04 Thread Martin Langhoff
On 9/4/05, Kalle Valo [EMAIL PROTECTED] wrote: I was trying to clone the git repository this morning and it fails every time: got 15891f81e0fa99333ad81e9271df5b2a72ba368e error: Couldn't get http://www.kernel.org/pub/scm/git/git.git/refs/heads/dbrt-test for heads/dbrt-test Tried to repro,

[PATCH] archimport: avoid committing on an Arch tag

2005-09-04 Thread Martin Langhoff
Arch tags are full commits (without any changed files) as well. Trust Arch to have put an unchanged tree in place (which seems to do reliably), and just add a tag new branch. Speeds up Arch imports significantly, and leaves history in a much saner state. Signed-off-by: Martin Langhoff [EMAIL

[PATCH] archimport autodetects import status, supports incremental imports

2005-09-04 Thread Martin Langhoff
If there is no GIT directory, archimport will assume it is an initial import. It now also supports incremental imports, skipping seen commits. You can now run it repeatedly to pull new commits from the Arch repository. Signed-off-by: Martin Langhoff [EMAIL PROTECTED] ---

Re: empty patch-2.6.13-git? patches on ftp.kernel.org

2005-09-04 Thread David Woodhouse
On Sun, 2005-09-04 at 17:31 +0200, Jan Dittmer wrote: David Woodhouse wrote: On Fri, 2005-09-02 at 02:00 -0700, Linus Torvalds wrote: Ahh. Please change that to rm -rf tmp-empty-tree mkdir tmp-empty-tree cd tmp-empty-tree git-init-db because

Re: Could not interpret heads/dbrt-test as something to pull

2005-09-04 Thread Junio C Hamano
Kalle Valo [EMAIL PROTECTED] writes: Rsync works for me also. But HTTP is still broken. Sorry, a broken repo. Fix made on master should percolate through soonish. - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo info

Re: Could not interpret heads/dbrt-test as something to pull

2005-09-04 Thread Kalle Valo
Junio C Hamano [EMAIL PROTECTED] writes: Rsync works for me also. But HTTP is still broken. Sorry, a broken repo. Fix made on master should percolate through soonish. HTTP clone works now, thanks. -- Kalle Valo - To unsubscribe from this list: send the line unsubscribe git in the body of

[PATCH] Make sure the diff machinery outputs \ No newline ... in english

2005-09-04 Thread Fredrik Kuivinen
In non-english locales diff(1) do sometimes output \ No newline at end of file in some other language. Set LC_ALL to C before execing diff to avoid this behaviour. Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED] --- diff.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-)

Re: Moved files and merges

2005-09-04 Thread Daniel Barkalow
On Sun, 4 Sep 2005, Junio C Hamano wrote: Sam Ravnborg [EMAIL PROTECTED] writes: If the problem is not fully understood it can be difficult to come up with the proper solution. And with the example above the problem should be really easy to understand. Then we have the tree as used by

Re: [PATCH] Make git-apply understand \ No newline at end of file in non-english locales

2005-09-04 Thread Fredrik Kuivinen
The message \ No newline at end of file which sometimes is produced by diff(1) is locale dependent. We can't assume more than that it begins with \ . Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED] --- The previous patch wasn't doing the right thing. Hopefully I have managed to get it right

Re: [PATCH] Make sure the diff machinery outputs \ No newline ... in english

2005-09-04 Thread Junio C Hamano
Fredrik Kuivinen [EMAIL PROTECTED] writes: In non-english locales diff(1) do sometimes output \ No newline at end of file in some other language. Set LC_ALL to C before execing diff to avoid this behaviour. Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED] I was thinking about this when I

Re: Moved files and merges

2005-09-04 Thread Junio C Hamano
Daniel Barkalow [EMAIL PROTECTED] writes: I think this is actually quite a regular merge, and I think we should be able to offer some assistance. The situation with K is normal: case #3ALT. If someone introduces a file and there's no file or directory with that name in other trees, we

Re: [PATCH] Make git-apply understand \ No newline at end of file in non-english locales

2005-09-04 Thread Junio C Hamano
Fredrik Kuivinen [EMAIL PROTECTED] writes: The message \ No newline at end of file which sometimes is produced by diff(1) is locale dependent. We can't assume more than that it begins with \ . Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED] --- The previous patch wasn't doing the right

Re: Tool renames? was Re: First stab at glossary

2005-09-04 Thread Horst von Brand
Junio C Hamano [EMAIL PROTECTED] wrote: I said: I'll draw up a strawman tonight unless somebody else does it first. [...] 3. Non-binaries are called '*-scripts'. In earlier discussions some people seem to like the distinction between *-script and others; I did not

Re: Tool renames? was Re: First stab at glossary

2005-09-04 Thread Junio C Hamano
Horst von Brand [EMAIL PROTECTED] writes: 3. Non-binaries are called '*-scripts'. In earlier discussions some people seem to like the distinction between *-script and others; I did not particularly like it, but I am throwing this in for discussion. I for one think this makes

Re: Tool renames? was Re: First stab at glossary

2005-09-04 Thread Junio C Hamano
Peter Williams [EMAIL PROTECTED] writes: *.pl is what is usually used for perl scripts. My recollection may be faulty, but '*.pl' was meant to be used for older Perl libraries back in perl4 days, and the standalone scripts are to be named '*.perl' but many people made the mistake of naming them

Re: [PATCH 0/2] Reorganize read-tree

2005-09-04 Thread Junio C Hamano
Daniel Barkalow [EMAIL PROTECTED] writes: I got mostly done with this before Linus mentioned the possibility of having multiple index entries in the same stage for a single path. I finished it anyway, but I'm not sure that we won't want to know which of the common ancestors contributed which,

[PATCH 2/2] Update documentation of --compose to git-send-email-script.txt

2005-09-04 Thread Ryan Anderson
Signed-off-by: Ryan Anderson [EMAIL PROTECTED] --- Documentation/git-send-email-script.txt | 13 + 1 files changed, 9 insertions(+), 4 deletions(-) 60765e20aa12da748f43204e25cb582f88fb16c8 diff --git a/Documentation/git-send-email-script.txt

Re: [PATCH] Make git-apply understand \ No newline at end of file in non-english locales

2005-09-04 Thread Fredrik Kuivinen
On Sun, Sep 04, 2005 at 12:25:16PM -0700, Junio C Hamano wrote: Fredrik Kuivinen [EMAIL PROTECTED] writes: The message \ No newline at end of file which sometimes is produced by diff(1) is locale dependent. We can't assume more than that it begins with \ . Signed-off-by: Fredrik

[PATCH 0/4] Support multiple ancestors in read-tree

2005-09-04 Thread Daniel Barkalow
Various messages have already described this series. There's still a memory leak that should get resolved, but otherwise it should work. I'm not entirely sure that all directory-file conflict cases are handled properly, and some undefined cases behave differently. Also, I was a bit careless