Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-23 Thread Barry K. Nathan
On Fri, Apr 22, 2005 at 12:37:37PM +0200, Petr Baudis wrote:
 Duh, segfaulting sed! Could you please check which of the sed
 invocations actually segfault for you?

)
echo; sed -re '
/
*Signed-off-by.*/Is//'$colsignoff''$coldefault'/
s/^//
'
;;

This only happens with an old sed from Mandrake 10.1; as I previously
mentioned, if I install the Mandriva 2005 LE sed package, then the
problem goes away. (And as I previously mentioned, I also need to have
the Mandriva mktemp package installed for git-pasky to work.)

 Thanks,

You're welcome.

-Barry K. Nathan [EMAIL PROTECTED]
-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-23 Thread Linus Torvalds


On Fri, 22 Apr 2005, Linus Torvalds wrote:
 
 I'm not even going to debug this bug. I'm just going to rewrite diff-cache 
 to do what I should have done originally, ie use the power of the 
 in-memory cache.

Done, and pushed out. It should hopefully work now.

Linus

-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-23 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 08:49:37AM CEST, I got a letter
where Greg KH [EMAIL PROTECTED] told me that...
 On Fri, Apr 22, 2005 at 05:09:31AM +0200, Petr Baudis wrote:
Hello,
  
FYI, I've released git-pasky-0.6.3 earlier in the night.
 
 Hm, fun thing to try:
   go into a kernel git tree.
   rm Makefile
   git diff
 
 Watch it as it thinks that every Makefile in the kernel tree is now
 gone...

Just FYI, this is bug in core git's diff-cache; also, when you update
the cache properly (either do

git rm Makefile

or

update-cache --remove Makefile

), it works fine. diff-cache should still not fail so horribly, though.

Unfortunately, I don't have time to debug it now. I will look at it
tomorrow if noone will fix it before. ;-)

-- 
Petr Pasky Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-22 Thread Greg KH
On Fri, Apr 22, 2005 at 05:09:31AM +0200, Petr Baudis wrote:
   Hello,
 
   FYI, I've released git-pasky-0.6.3 earlier in the night.

Hm, fun thing to try:
go into a kernel git tree.
rm Makefile
git diff

Watch it as it thinks that every Makefile in the kernel tree is now
gone...

thanks,

greg k-h
-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-22 Thread Barry K. Nathan
With git-pasky 0.6.3, git log is unusable on my Mandrake 10.1 system.
Basically I get a neverending flood of these until I press 'q' to quit
less:

/home/barryn/softbag/git-pasky-0.6.3/gitlog.sh: line 73:  7598 Segmentation faul
t  sed -re '
/ *Signed-off-by.*/Is//'$colsignoff''$c
oldefault'/
s/^//
'
/home/barryn/softbag/git-pasky-0.6.3/gitlog.sh: line 73:  7609 Segmentation faul
t  sed -re '
/ *Signed-off-by.*/Is//'$colsignoff''$c
oldefault'/
s/^//
'
/home/barryn/softbag/git-pasky-0.6.3/gitlog.sh: line 73:  7620 Segmentation faul
t  sed -re '
/ *Signed-off-by.*/Is//'$colsignoff''$c
oldefault'/
s/^//
'

git-pasky-0.6.2 works fine.

I'm not sure if I have time tonight (or tomorrow) to troubleshoot this
further, but I'll see if I can.

-Barry K. Nathan [EMAIL PROTECTED]

-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-22 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 09:24:37AM CEST, I got a letter
where Barry K. Nathan [EMAIL PROTECTED] told me that...
 On Fri, Apr 22, 2005 at 12:16:26AM -0700, Barry K. Nathan wrote:
  With git-pasky 0.6.3, git log is unusable on my Mandrake 10.1 system.
  Basically I get a neverending flood of these until I press 'q' to quit
  less:
 [snip sed segmentation faults which happen with 0.6.3 but not 0.6.2]
  I'm not sure if I have time tonight (or tomorrow) to troubleshoot this
  further, but I'll see if I can.
 
 I had sed-4.1.1-2mdk. I downloaded sed-4.1.4-2mdk (from Mandriva 2005
 Limited Edition) and updated to that, and the problem went away.
 
 FWIW this is the second package I've had to update to the Mandriva 2005
 LE level (the first was mktemp). I don't mind however.

Duh, segfaulting sed! Could you please check which of the sed
invocations actually segfault for you?

Thanks,

-- 
Petr Pasky Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-22 Thread Linus Torvalds


On Sat, 23 Apr 2005, Petr Baudis wrote:
 
 Just FYI, this is bug in core git's diff-cache;

Nice find. 

Yes, I told you guys I hadn't tested it well ;)

diff-cache does the same diff trees in lockstep thing that diff-tree 
does, but it's actually more complex, since the _tree_ part always needs 
to be recursively followed, while the _cache_ part is this linear list 
that is already expanded.

Which just made the whole algorithm very messy.

Once I found out how nasty it was to do that compare, I was actually
planning to re-write the thing using the same approach that read-tree -m
tree does - ie move the tree information _into_ the in-memory cache, at
which point it should be absolutely trivial to compare the two. But since 
the horrid algorithm seemed to end up working, I never did.

I'm not even going to debug this bug. I'm just going to rewrite diff-cache 
to do what I should have done originally, ie use the power of the 
in-memory cache. That's also automatically going to properly warn about 
unmerged files.

Give me five minutes ;)

Linus
-
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


Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-21 Thread Steven Cole
On Thursday 21 April 2005 09:09 pm, Petr Baudis wrote:
   Hello,
 
   FYI, I've released git-pasky-0.6.3 earlier in the night. It brings
 especially plenty of bugfixes, but also some tiny enhancements, like
 colored log and ability to pick branch in the remote repository. git log
 and git patch now also accept range of commits, so e.g. if you do

Here's a patch to let people know about the nice color feature.

Signed-off-by: Steven Cole [EMAIL PROTECTED]

Index: git
===
--- 0a9ee5a4d947b998a7ce489242800b39f985/git  (mode:100755 
sha1:39969debd59ed51c57973c819cdcc3ca8a7da819)
+++ uncommitted/git  (mode:100755)
@@ -35,7 +35,7 @@
forkBNAME BRANCH_DIR [COMMIT_ID]
help
initRSYNC_URL
-   log [COMMIT_ID | COMMIT_ID:COMMIT_ID]
+   log [-c] [COMMIT_ID | COMMIT_ID:COMMIT_ID]
ls  [TREE_ID]
lsobj   [OBJTYPE]
lsremote
Index: gitlog.sh
===
--- 0a9ee5a4d947b998a7ce489242800b39f985/gitlog.sh  (mode:100755 
sha1:50eab642cdf5e695cf15be4ce3a7469dd68637e7)
+++ uncommitted/gitlog.sh  (mode:100755)
@@ -7,6 +7,14 @@
 # Major optimizations by (c) Phillip Lougher.
 # Rendered trivial by Linus Torvalds.
 #
+# Takes a -c option to add color to the output.
+# Currently, the colors are:
+#
+#  header  Green   
+#  author  Cyan
+#  committer   Magenta
+#  signoff Yellow
+#
 # Takes an id resolving to a commit to start from (HEAD by default),
 # or id1:id2 representing an (id1;id2] range of commits to show.
 
-
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