GIT 0.99.4 (preview)

2005-08-07 Thread Junio C Hamano
I said: My tentative plan is for 0.99.4 to finish send-pack, 0.99.5 to enhance fetch-pack, 0.99.6 to finish the first pass for the documentation updates and stabilizing the binary packaging. Ok, I am almost ready to push 0.99.4 out. Here is what I have in the public repository. - The

git-format-patch-script bug?

2005-08-07 Thread Eric W. Biederman
I haven't had a chance to investigate this much yet but I have ran into a peculiar problem. I was trying to help someone track down a bug that occurred between linux-2.6.12 and linux-2.6.13-rc1. Since it was very much an unknown where the problem was introduced I decided to run git format-patch

Re: qgit-0.81

2005-08-07 Thread Marco Costalba
Linus Torvalds wrote: Ok, this is nicer than gitk, with the parents showing up in the commit message and thus easy to go to. You might add children too: it's not something git itself knows about intrisically, but since you've already built the graph, at least you see what children are part of

Re: gitk SHA link hovers

2005-08-07 Thread Paul Mackerras
Linus Torvalds writes: This makes the cursor change when you hover over a SHA1 link with the new hypertext gitk commit ID linking feature. I committed something based on this but with extra stuff to make the cursor changes work with the change from the normal cursor to the watch cursor and

Re: gitk hyperlinks

2005-08-07 Thread Paul Mackerras
Junio C Hamano writes: I did, and will push it out shortly, but I think you need this patch. To make later merges from you easier, I will not put this in my master branch. I have committed this plus the hand cursor for the links plus a small change to make gitk display commit messages

qgit-0.82 (was Re: qgit-0.81)

2005-08-07 Thread Marco Costalba
Marco Costalba wrote: Linus Torvalds wrote: - Any chance of having a git archive of qgit? I realize that sourceforge doesn't have git archives, but (a) maybe you can ask and (b) maybe there are alternate places you could put it. It's just sad having to download tar-balls. I will try

Re: git-format-patch-script bug?

2005-08-07 Thread Junio C Hamano
[EMAIL PROTECTED] (Eric W. Biederman) writes: I was trying to help someone track down a bug that occurred between linux-2.6.12 and linux-2.6.13-rc1. Since it was very much an unknown where the problem was introduced I decided to run git format-patch so I could see what all of the differences

Re: git-format-patch-script bug?

2005-08-07 Thread Eric W. Biederman
Junio C Hamano [EMAIL PROTECTED] writes: [EMAIL PROTECTED] (Eric W. Biederman) writes: I was trying to help someone track down a bug that occurred between linux-2.6.12 and linux-2.6.13-rc1. Since it was very much an unknown where the problem was introduced I decided to run git format-patch

Re: git-format-patch-script bug?

2005-08-07 Thread Junio C Hamano
[EMAIL PROTECTED] (Eric W. Biederman) writes: What format-patch does is currently is fine. If format-patch would simply notice the case and fail gracefully that would be sufficient to avoid giving false impressions. Hmph. Since it uses merge-order, We should be able to change it use the

Re: use of temporary refs in resolve

2005-08-07 Thread Linus Torvalds
On Sun, 7 Aug 2005, Junio C Hamano wrote: Also ORIG_HEAD is probably redundant. After a successful automerge, the same information can be had by HEAD^1 Absolutely not. You forgot about one of the most common merge cases: fast-forward. In fact, ORIG_HEAD is _the_ most common head I use

Re: use of temporary refs in resolve

2005-08-07 Thread Junio C Hamano
Linus Torvalds [EMAIL PROTECTED] writes: In fact, ORIG_HEAD is _the_ most common head I use explicitly. A. You are right. How about LAST_MERGE? - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo info at

Re: gitk parent information in commit window

2005-08-07 Thread Junio C Hamano
Linus Torvalds [EMAIL PROTECTED] writes: [ Btw, the patch was generated against a tree that had Paul's hovering patches merged. Junio, I don't think you've merged that yet, so this may apply better to Paul's tree than to standard git. But I _think_ it will apply cleanly to either one

backward compatible changes to format-patch, rebase, cherry and fetch

2005-08-07 Thread Junio C Hamano
Marco Costalba [EMAIL PROTECTED] writes: A suggestion I would like to present is if can be useful a kind of scheduling/list of planned compatibility break features so that developers can know in advance when and what will break their stuff and users can know when they will need to upgrade.

Re: gitk parent information in commit window

2005-08-07 Thread A Large Angry SCM
Paul Mackerras wrote: ... I have been thinking about adding dialog windows to allow the user to select which repository and which range of commits they want to look at. Do you think that would be useful for you? Yes! - To unsubscribe from this list: send the line unsubscribe git in the body of

Re: gitk parent information in commit window

2005-08-07 Thread Junio C Hamano
Paul Mackerras [EMAIL PROTECTED] writes: Linus Torvalds writes: This adds a useful Parent: line to the git commit information window. Cool! Applied and pushed out. Thanks. Merged and pushed out. I have been thinking about adding dialog windows to allow the user to select which

Re: gitk parent information in commit window

2005-08-07 Thread A Large Angry SCM
Linus Torvalds wrote: This adds a useful Parent: line to the git commit information window. It looks something like this (from the infamous octopus merge): Author: Junio C Hamano [EMAIL PROTECTED] 2005-05-05 16:16:54 Committer: Junio C Hamano [EMAIL PROTECTED] 2005-05-05

Re: GIT 0.99.4 (preview)

2005-08-07 Thread Horst von Brand
My proposed patch, the description as is is misleading. The rest of the .spec file looks sane (yes, I've built my share of RPMs over the years). diff --git a/git-core.spec.in b/git-core.spec.in --- a/git-core.spec.in +++ b/git-core.spec.in @@ -2,7 +2,7 @@ Name: git-core Version: