Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-18 Thread Paul Mackerras
Linus Torvalds writes: Paul, I hate to tell you about yet another flag to git-rev-list, but did you realize that in addition to all the other magic flags, there's a flag called --parents? Cool. I didn't realize that. The current version uses it now. Umm. git-rev-list really does

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-18 Thread Johannes Schindelin
Hi, On Fri, 19 Aug 2005, Paul Mackerras wrote: Linus Torvalds writes: Paul, I hate to tell you about yet another flag [...] But why? You're doing such a fine job telling people about flags :-) Umm. git-rev-list really does everything. Rule of thumb: if you _ever_ need to look at any

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-18 Thread Linus Torvalds
On Fri, 19 Aug 2005, Paul Mackerras wrote: Umm. git-rev-list really does everything. Rule of thumb: if you _ever_ need to look at any other internal git information, you're probably doing something wrong, or you've missed yet another flag ;) I still look in [gitdir]/refs/tags/* and

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-17 Thread Junio C Hamano
Wolfgang Denk [EMAIL PROTECTED] writes: The display in gitk --all gets changed a bit (before the branch was the leftmost line, now it's the rightmost one), but it's still a dangling head, and the selected merge point (commit 24ee89) is still displayed with just one parent

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-17 Thread Paul Mackerras
Junio C Hamano writes: My Tcl/Tk is really rusty, and I do not like this patch, but here is my stab at teaching the code that reads commit objects how to use grafts as well. I added support for grafts to gitk just yesterday, and it should be on kernel.org by now. I also committed the changes

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-08-17 Thread Linus Torvalds
On Thu, 18 Aug 2005, Paul Mackerras wrote: I added support for grafts to gitk just yesterday, and it should be on kernel.org by now. I also committed the changes to send lines into hyperspace. Paul, I hate to tell you about yet another flag to git-rev-list, but did you realize that in

[PATCH] Teach parse_commit_buffer about grafting.

2005-07-30 Thread Junio C Hamano
Introduce a new file $GIT_DIR/info/grafts (or $GIT_GRAFT_FILE) which is a list of fake commit parent records. Each line of this file is a commit ID, followed by parent commit IDs, all 40-byte hex SHA1 separated by a single SP in between. The records override the parent information we would

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-07-30 Thread Matthias Urlichs
Hi, Junio C Hamano wrote: Introduce a new file $GIT_DIR/info/grafts Nice work. Has anybody git-imported the old tarfile+patch history yet? If not, I'll do it over the weekend. -- Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED] Disclaimer: The quote was selected

Re: [PATCH] Teach parse_commit_buffer about grafting.

2005-07-30 Thread Johannes Schindelin
Hi, is it possible that you forgot to initialize commit_graft_nr to 0? Ciao, Dscho - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html