[PATCH 1/4] Add a function for getting a struct tree for an ent.

Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- tree.c | 21 + tree.h |3 +++ 2 files changed, 24 insertions(+), 0 deletions(-) 3bfcc20b6aeff3e1fbcce97a426383c9770a2105 diff --git a/tree.c b/tree.c --- a/tree.c +++ b/tree.c @@ -1,5 +1,7 @@ #include tree.h

[PATCH 2/4] Add function to append to an object_list.

Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- object.c | 11 +++ object.h |3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) 88cf2db55848e7a2cf655171c7e9fd74c70a0281 diff --git a/object.c b/object.c --- a/object.c +++ b/object.c @@ -184,6 +184,17 @@ struct

[PATCH 3/4] Rewrite read-tree

Adds support for multiple ancestors, removes --emu23, much simplification. Signed-off-by: Daniel Barkalow [EMAIL PROTECTED] --- read-tree.c | 811 +++-- t/t1005-read-tree-m-2way-emu23.sh | 422 --- 2 files changed, 425

[PATCH 4/4] Document the trivial merge rules for 3(+more ancestors)-way merges.

Signed-off-by: Daniel Barkalow --- Documentation/technical/trivial-merge.txt | 92 + 1 files changed, 92 insertions(+), 0 deletions(-) create mode 100644 Documentation/technical/trivial-merge.txt 7544be0a8eda7b796150729a7795c2639278da62 diff --git

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

On Sun, Sep 04, 2005 at 11:48:08AM -0700, Junio C Hamano wrote: 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:

Re: [PATCH 0/2] Update git-send-email-script with --compose

Ryan, is it possible to fix the git-send-email script to just work reading in the emails that `git-format-patch-script -o patchdir origin` generates? I have a very ugly local patch to git-send-email-script that - reads from from git-var, can be overridden by passing an explicit --from - reads

bogus merges

A recent commit in linux-2.6 looks like this: commit b129a8ccd53f74c43e4c83c8e0031a4990040830 Merge: 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 194d0710e1a7fe92dcf860ddd31fded8c3103b7a Author: Russell King [EMAIL PROTECTED] Date: Wed Aug 31 10:12:14 2005 +0100 [SERIAL] Clean up and fix tty

Re: Moved files and merges

Junio C Hamano wrote: 1 / \ 0-2-3-5-7 \ / 4-6 It shouldn't matter to the merge at 7 if the 2-3 reorganization was done locally, by applying a patch, or by merging. There was another problem in my message that treated #3 specially. I did it that way primarily because I wanted to

Re: [PATCH 0/2] Update git-send-email-script with --compose

On Mon, Sep 05, 2005 at 11:16:57PM +1200, Martin Langhoff wrote: Ryan, is it possible to fix the git-send-email script to just work reading in the emails that `git-format-patch-script -o patchdir origin` generates? I have a very ugly local patch to git-send-email-script that - reads

Re: Moved files and merges

On Mon, 5 Sep 2005, H. Peter Anvin wrote: It would also hade the somewhat interesting possibility that one could remove and recreate a file and have it exist as a different entity. That probably needs to be a user option. It's a totally broken model. Really. You think it solves issues,

Re: bogus merges

On Mon, 5 Sep 2005, Wayne Scott wrote: A recent commit in linux-2.6 looks like this: It hopefully shouldn't happen any more with the improved and fixed git-merge-base. Author: Russell King [EMAIL PROTECTED] Date: Wed Aug 31 10:12:14 2005 +0100 I suspect rmk is using cogito-0.13, and

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

On Mon, 5 Sep 2005, David Kågedal wrote: But to the users (like myself), there's no point in naming it by whether it's a script or a binary. So? There's no downside. To you, as a user, you never see the -script ending anyway. You'd never type it out, or you're already doing something

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

Linus Torvalds [EMAIL PROTECTED] writes: On Mon, 5 Sep 2005, David Kågedal wrote: But to the users (like myself), there's no point in naming it by whether it's a script or a binary. So? There's no downside. To you, as a user, you never see the -script ending anyway. You'd never type

Re: Moved files and merges

Linus Torvalds wrote: It's a totally broken model. Really. You think it solves issues, but it just creates more bugs and problems than it solves. Trust me. The whole point of git is that content is the only thing that matters, and that there isn't any other meta-data. If you break that

Missing documentation

The following is the list of files in the Documentation directory that have *NO* useful text in them at all. git-build-rev-cache.txt git-checkout-script.txt git-diff-script.txt git-format-patch-script.txt git-get-tar-commit-id.txt

Re: Moved files and merges

Linus Torvalds [EMAIL PROTECTED] writes: Of course, if you don't push it back, but keep the two trees separate and keep on modifying files that have different names in the other repository, you'll keep on getting into the situation that the trivial merge doesn't work. So we _do_ want to

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

Linus Torvalds [EMAIL PROTECTED] writes: ... and I don't see _any_ point to naming by what _kind_ of interpreter you use. Why would _anybody_ care whether something is written in perl vs shell? One possibility that comes to mind is to again help developers who use an editor that is

Re: Moved files and merges

H. Peter Anvin [EMAIL PROTECTED] writes: One question, of course, is if one should simply keep additional metadata around to handle this sort of situations. One could, for example, keep a UUID for each file,... If I am not mistaken, that is exactly what tla does. It seems to work well in

git/cogito suggestion: tags with descriptions

Hi folks, I've been using git on my new projects, and loving it! When I use tags, I typically will use a name like 0.3_basic_description and 0.4_full_outline, because I want to know not only what version number I'm considering, but also the reason why I chose to tag that particular version. The

Re: [PATCH 0/2] Update git-send-email-script with --compose

Ryan Anderson [EMAIL PROTECTED] writes: On Mon, Sep 05, 2005 at 11:16:57PM +1200, Martin Langhoff wrote: - reads subject from the first line of STDIN or file. If the line doesn't start with [PATCH it provides the [PATCH] prefix. I found it really confusing that it wants to get 'from' in

Re: git/cogito suggestion: tags with descriptions

Zack Brown [EMAIL PROTECTED] writes: It would be great if tags also allowed a brief description to go along with them, that would show up in cg-tag-ls. Then I could seek to a tag that's just an easy-to-type version number, and still have an idea of what's significant about that version

Re: [PATCH 0/2] Update git-send-email-script with --compose

On 9/6/05, Junio C Hamano [EMAIL PROTECTED] wrote: Ryan Anderson [EMAIL PROTECTED] writes: Sorry about that - I always export using git-format-patch using --mbox, and those work nicely. I'm a bit reluctant to do the [PATCH] fixup, but I think I will: Thanks Ryan for the clarification! I

Re: [PATCH 0/2] Update git-send-email-script with --compose

Martin Langhoff [EMAIL PROTECTED] writes: Fair enough -- blame it on my primitive approach of only having 2 working repositories, and having some patches in them that I'm not pushing upstream. Exporting to mbox would mean that I have to edit the mbox file to remove the patches I don't intend

Re: [PATCH 0/2] Update git-send-email-script with --compose

On 9/6/05, Junio C Hamano [EMAIL PROTECTED] wrote: Not really; --mbox output is one-file-per-patch and it is up to you which ones to pick and concatenate them in what order, if you want them in a single file. Hr. Then I better hide away in a little cave, and shut my big mouth up. ;-) It

Re: [PATCH 0/2] Update git-send-email-script with --compose

Martin Langhoff [EMAIL PROTECTED] writes: It shows that I was never familiar with the practices of linux hackers. I've always read the references to mboxes holding patchbombs meaning literally one mbox file with a zillion contatenated patches received via email. To be fair to you, it is

Re: git/cogito suggestion: tags with descriptions

Hi Junio! On Mon, Sep 05, 2005 at 12:01:40PM -0700, Junio C Hamano wrote: Zack Brown [EMAIL PROTECTED] writes: It would be great if tags also allowed a brief description to go along with them, that would show up in cg-tag-ls. Then I could seek to a tag that's just an easy-to-type

patches

Hi, attached are two patches: the first fixes some build issues on solaris10/x86 with sunpro (and some that also happen with gcc), while the second adds a simple way to add additional search and link paths for curl library and headers. patrick mauritz (not on the list, please Cc:) diff -ur

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

On 9/6/05, Linus Torvalds [EMAIL PROTECTED] wrote: Grepping for strings. For example, when renaming a binary, the sane way to check that you fixed all users right now is grep old-binary-name *.c *.h *-scripts and you catch all users. Grep knows how to ignore binary files. Try:

[libata ahci] minor remove/unplug path cleanup

tree 823f9aec427a108c873e50f215e36d225661a068 parent 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 author Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 12:18:28 -0400 committer Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 12:18:28 -0400 [libata ahci] minor remove/unplug path cleanup Don't bother

[libata] __iomem annotations for various drivers

tree aa83ab9aa74e85b7a5c76f40764514a6ac266226 parent e005f01de32f22be8af255f2761018e9766000d2 author Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 13:18:18 -0400 committer Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 13:18:18 -0400 [libata] __iomem annotations for various drivers

[libata] allow ATAPI to be enabled with new atapi_enabled module option

tree 486aa6a40ea419c14d02bc8561cdb8485f6a5189 parent 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 author Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 11:37:42 -0400 committer Jeff Garzik [EMAIL PROTECTED] Tue, 30 Aug 2005 11:37:42 -0400 [libata] allow ATAPI to be enabled with new atapi_enabled

[libata] fix ATAPI-enable typo

tree 157728e07af3efc756737108b01f9feee40eb360 parent 1623c81eece58740279b8de802fa5895221f2044 author Jeff Garzik [EMAIL PROTECTED] Wed, 31 Aug 2005 05:52:18 -0400 committer Jeff Garzik [EMAIL PROTECTED] Wed, 31 Aug 2005 05:52:18 -0400 [libata] fix ATAPI-enable typo Dumb typo spotted by Mark

[WATCHDOG] Makefile-probe_order-patch

tree 0c65ed434e64101630ac04944040cf9b17ae6ca2 parent f505380ba7b98ec97bf25300c2a58aeae903530b author Wim Van Sebroeck [EMAIL PROTECTED] Wed, 17 Aug 2005 01:49:24 +0200 committer Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:15:32 +0200 [WATCHDOG] Makefile-probe_order-patch Re-arrange

[WATCHDOG] Kconfig+Makefile-clean

tree 6e58e256da91f7c78221b4f887c0d0479ca3f304 parent be3df0f94d77ba3cff40c14c3e21a753c40ba6f2 author Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:46:56 +0200 committer Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:46:56 +0200 [WATCHDOG] Kconfig+Makefile-clean Clean the

[WATCHDOG] correct sysfs name for watchdog devices

tree 82dd082d2f40b0e86fac99893ff1ce44c73b635a parent 09c8a9a0c0fe5b3182b6ecfa556fa77a55892c93 author Olaf Hering [EMAIL PROTECTED] Wed, 17 Aug 2005 08:58:34 +0200 committer Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:51:18 +0200 [WATCHDOG] correct sysfs name for watchdog devices While

[WATCHDOG] s3c2410 watchdog power management

tree 72ce7609578358929453e65c0c67796d5bff2b07 parent 2dab3cabc4b3c1ef53965233dc8a05e0ddeeb38e author Ben Dooks [EMAIL PROTECTED] Wed, 17 Aug 2005 09:03:23 +0200 committer Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:54:16 +0200 [WATCHDOG] s3c2410 watchdog power management Patch from

[WATCHDOG] softdog-timer-running-oops.patch

tree 6e5f8ee1053e7add2ec1890b594dc4086ae39f09 parent 93642ecd463df30d032da8ac37c2676cee4ad876 author Chuck Ebbert [EMAIL PROTECTED] Fri, 19 Aug 2005 14:14:07 +0200 committer Wim Van Sebroeck [EMAIL PROTECTED] Sat, 03 Sep 2005 13:59:46 +0200 [WATCHDOG] softdog-timer-running-oops.patch The softdog