On Tue, Apr 19, 2005 at 05:51:07AM +0200, Petr Baudis wrote:
> http://pasky.or.cz/~pasky/dev/git
I pulled the tar.bz2 and did make:
gcc -g -O3 -Wall -o merge-cache merge-cache.o libgit.a libgit.a -lssl -lz
gcc -g -O3 -Wall -c -o unpack-file.o unpack-file.c
gcc -g -O3 -Wall -o unpack-file u
On Mon, 18 Apr 2005, Junio C Hamano wrote:
> ... what about names? When somebody other than connectivity
> checker walks a tree, it would be more likely than not that
> it wants to know what each entry is called, wound't it?
Yes; just add the name to the tree_entry_list.
> I can get the type o
> "LT" == Linus Torvalds <[EMAIL PROTECTED]> writes:
LT> What's the right way?
LT> Maybe
LT> if merge "$src2" "$orig" "$src1"
LT> then
LT> cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
LT> fi
LT> echo Leaving conflict merge in $src2
LT> exit 1
LT>
> "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
DB> This patch adds actual information to struct tree, making it possible to
DB> tell what sorts of things the referenced objects are. This is needed for
DB> http-pull, and Junio wanted something of the sort.
Thanks for keeping me in the l
Alright, let's try some small i2c and w1 patches...
Could you merge with:
kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
It contains 4 small patches, 2 i2c and 2 w1 bugfixes, diffstat is
below, I'll figure out how to send the individual patches later.
thanks,
greg k-h
drivers
Hello,
so I've implemented "true" git merge in git-pasky, using core git's
merging capabilities. It seems to even work. :-)
I tested it briefly, and even did one non-conflicting and one
conflicting merge with Linus with this, but I'd like to hear your
comments and possibly more testing befo
I just stumbled across this page, dated 2003, which foreshadows a couple
of the decisions Linus has made for git:
http://ydirson.free.fr/en/software/scm/vc.txt
Here are the parts that particularly caught my eye:
"what's so special about files ?" where the author suggests that
existing SCM syst
On Tue, 19 Apr 2005, Petr Baudis wrote:
> Dear diary, on Tue, Apr 19, 2005 at 04:52:26AM CEST, I got a letter
> where Daniel Barkalow <[EMAIL PROTECTED]> told me that...
> > because I can't find a way to make recent GCC reject C99 features but not
> > old GNU extensions.
>
> Do we use any?
Quite
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> Fair enough. If you pull from
>
> rsync://www.parisc-linux.org/~jejb/scsi-misc-2.6.git
Thanks. Pulled and pushed out.
> Doing this exposed two bugs in your merge script:
>
> 1) It doesn't like a completely new directory (the misc tree contains
Dear diary, on Tue, Apr 19, 2005 at 04:48:09AM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> > git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1
> > --- a/git-merge-one-file-script
> > +++ b/git-merge-one-file-script
> > @@ -43,7 +43,7 @@ case "${
Dear diary, on Tue, Apr 19, 2005 at 04:52:26AM CEST, I got a letter
where Daniel Barkalow <[EMAIL PROTECTED]> told me that...
> because I can't find a way to make recent GCC reject C99 features but not
> old GNU extensions.
Do we use any?
--
Petr "Pasky" Baudis
St
On Mon, 18 Apr 2005, David A. Wheeler wrote:
> Petr Baudis wrote:
> > [Re: Daniel Barkalow <[EMAIL PROTECTED]>'s patch]
> > Note that you are breaking gcc-2.95 compatibility when using declarator
> > in the middle of a block. Not that it might be a necessarily bad thing
> > ;-) (although I still
On Mon, 18 Apr 2005, Chris Wedgwood wrote:
>
> On Mon, Apr 18, 2005 at 05:45:48PM -0700, Greg KH wrote:
>
> > But if you really don't like it, and you don't want anyone trying to
> > hide anything, at least allow for a proper domainname. On my boxes,
> > the domainname doesn't show up at all wi
On Tue, 19 Apr 2005, Petr Baudis wrote:
>
> this patch fixes git-merge-one-file-script's automerge.
Nope, it doesn't. The original may not have worked, but neither does your
vesion either: the reason for the exit 1 is that the _script_ should exit,
but when you put it in a sub-shell with (..)
Petr Baudis wrote:
[Re: Daniel Barkalow <[EMAIL PROTECTED]>'s patch]
Note that you are breaking gcc-2.95 compatibility when using declarator
in the middle of a block. Not that it might be a necessarily bad thing
;-) (although I still use gcc-2.95 a lot), just to ring a bell so that
it doesn't slip
On Mon, 2005-04-18 at 17:29 -0700, Linus Torvalds wrote:
> 2.6.12 is some time away, if for no other reason than the fact that this
> SCM thing has obviously eaten two weeks of my time. So I'd be inclined to
> chalk this up as a "learning experience" with git, and just go forward.
Fair enough.
Dear diary, on Tue, Apr 19, 2005 at 03:54:56AM CEST, I got a letter
where Daniel Barkalow <[EMAIL PROTECTED]> told me that...
> Index: commit.c
> ===
> --- b3cf8daf9b619ae9f06a28f42a4ae01b69729206/commit.c (mode:100644
> sha1:0099baa
This is a minor UI thing, but what the heck. I propose
changing "pull" to ONLY download, and "update" to pull AND merge.
Whenever you want to update, just say "git update", end of story.
Why? It seems oddly inconsistent that "pull" sometimes merges
in changes, but at other times it doesn't. If I n
Ray Lee wrote:
> On Mon, 2005-04-18 at 21:05 -0400, Kevin Smith wrote:
>
The other is "replace very instace of identifier `foo` with
identifier`bar`".
>>>
>>>That could be derived, however, by a particularly smart parser [1].
>>
>>No, it can't. Seriously. A darcs replace patch is encoded
On Mon, 18 Apr 2005, Junio C Hamano wrote:
> > "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> DB> On Mon, 18 Apr 2005, Linus Torvalds wrote:
> >> On Sun, 17 Apr 2005, Daniel Barkalow wrote:
> >> >
> >> > This series introduces common parsers for objects, and ports the programs
> >> >
This changes merge-base to use the dates of commit to search the
history. It will find the most recent common ancestor, rather than the one
the fewest generations away. It also demonstrates scanning the history by
date.
Signed-Off-By: Daniel Barkalow <[EMAIL PROTECTED]>
Index: merge-base.c
===
This adds a command to pull a commit and dependant objects from an HTTP
server.
Signed-Off-By: Daniel Barkalow <[EMAIL PROTECTED]>
Index: Makefile
===
--- 50afb5dd4184842d8da1da8dcb9ca6a591dfc5b0/Makefile (mode:100644
sha1:803f1d49c
Functions for a date-ordered queue of commits, progressively pulled out of
the history incrementally. Linus wanted this for finding the most recent
common ancestor, and it might be relevant to logging.
Signed-Off-By: Daniel Barkalow <[EMAIL PROTECTED]>
Index: commit.c
=
This patch adds actual information to struct tree, making it possible to
tell what sorts of things the referenced objects are. This is needed for
http-pull, and Junio wanted something of the sort.
Signed-Off-By: Daniel Barkalow <[EMAIL PROTECTED]>
Index: tree.c
Dear diary, on Tue, Apr 19, 2005 at 03:40:54AM CEST, I got a letter
where Steven Cole <[EMAIL PROTECTED]> told me that...
> Here is perhaps a better way to provide detailed help for each
> git command. A command.help file for each command can be
> written in the style of a man page.
I don't like
Here are the things I was saving for after the previous set:
1: Report the actual contents of trees
2: Add functions for scanning history by date
3: Add http-pull, a program to fetch the objects you need by HTTP
4: Change merge-base to find the most recent common ancestor
1 and 2 are core ext
On Mon, Apr 18, 2005 at 05:45:48PM -0700, Greg KH wrote:
> But if you really don't like it, and you don't want anyone trying to
> hide anything, at least allow for a proper domainname. On my boxes,
> the domainname doesn't show up at all without that patch (just the
> getdomainname() part). I'll
On Monday 18 April 2005 10:59 am, Steven Cole wrote:
> Petr Baudis wrote:
> > Dear diary, on Mon, Apr 18, 2005 at 06:42:26AM CEST, I got a letter
> > where Steven Cole <[EMAIL PROTECTED]> told me that...
> [snippage]
> >
> >>This patch will provide the comment lines in the shell script associated
On Tue, 2005-04-19 at 02:55 +0200, Juliusz Chroboczek wrote:
> > But avoiding "mv" patches would be downright silly.
>
> Aye, that will require some metadata on the git side (the hack,
> suggested by Linus, of using git hashes to notice moves won't work).
Okay, I'm coming to believe I missed some
On Mon, 2005-04-18 at 21:05 -0400, Kevin Smith wrote:
> >>The other is "replace very instace of identifier `foo` with
> >>identifier`bar`".
> > That could be derived, however, by a particularly smart parser [1].
>
> No, it can't. Seriously. A darcs replace patch is encoded as rules, not
> effects
On Mon, 18 Apr 2005, Junio C Hamano wrote:
> I was looking at the tree part and am thinking that it would
> make it much nicer if your tree object records path for each
> entry.
You're entirely right, and I've actually now written the code that does
it. I'm planning to send out a patch for that
On Mon, 2005-04-18 at 18:12 -0700, Greg KH wrote:
> Ok, then why display it as one?
Nobody ever displays it as one as far as I'm aware. That would be
something like "mailto:$COMMITTER";
> But I'll wait for Russell to wake up and start quoting the proper EU
> privacy laws that he feels causes him
> "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
DB> On Mon, 18 Apr 2005, Linus Torvalds wrote:
>> On Sun, 17 Apr 2005, Daniel Barkalow wrote:
>> >
>> > This series introduces common parsers for objects, and ports the programs
>> > that currently use revision.h to them.
>> >
>> > 1: the
Dear diary, on Tue, Apr 19, 2005 at 03:12:37AM CEST, I got a letter
where Greg KH <[EMAIL PROTECTED]> told me that...
> But I'll wait for Russell to wake up and start quoting the proper EU
> privacy laws that he feels causes him to be forced to obfuscate his
> email addresses in the changelog commi
On Tue, Apr 19, 2005 at 10:52:30AM +1000, David Woodhouse wrote:
> On Mon, 2005-04-18 at 17:45 -0700, Greg KH wrote:
> > Well Russell has stated that he has to for EU Privacy reasons. And I'd
> > like to do it as I don't have a local suse.de hostname for my laptop and
> > my employer probably does
For the record, mostly... (this is how it already is in git-pasky-0.5)
Dear diary, on Sun, Apr 17, 2005 at 02:07:36AM CEST, I got a letter
where Daniel Barkalow <[EMAIL PROTECTED]> told me that...
> > Now, what about git branch and git update for switching between
> > branches? I think this is the
Hm, I think I got this set up properly, but don't have an automated
script to generate the changelog and diffstat messages yet, so bear with
me...
Could you merge with:
kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
It should be against your latest git tree. It contains a number
Ray Lee wrote:
> On Mon, 2005-04-18 at 21:04 +, [EMAIL PROTECTED] wrote:
>
>>The other is "replace very instace of identifier `foo` with identifier`bar`".
>
>
> That could be derived, however, by a particularly smart parser [1].
No, it can't. Seriously. A darcs replace patch is encoded as r
Hello,
this patch fixes git-merge-one-file-script's automerge.
Signed-off-by: Petr Baudis <[EMAIL PROTECTED]>
git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -43,7 +43,7 @@ case "${1:-.}${2:-.}${3:-.}" in
On Mon, 2005-04-18 at 17:45 -0700, Greg KH wrote:
> Well Russell has stated that he has to for EU Privacy reasons. And I'd
> like to do it as I don't have a local suse.de hostname for my laptop and
> my employer probably doesn't really want my [EMAIL PROTECTED] address
> showing up :)
Why not? Do
[Using git as a backend for Darcs.]
> The problem I have with this is that "other" repository formats (e.g. git)
> store "tree versions", not "changes", and I think it would be fragile to
> try to store "changes" (in the darcs sense) in them.
Not really; a Darcs patch is just a pair of two git ve
Dear diary, on Tue, Apr 19, 2005 at 02:44:15AM CEST, I got a letter
where Kay Sievers <[EMAIL PROTECTED]> told me that...
> I'm hacking on a simple web interface, cause I missed the bkweb too much.
> It can't do much more than browse through the source tree and show the
> log now, but that should c
On Mon, Apr 18, 2005 at 05:31:16PM -0700, Linus Torvalds wrote:
>
>
> On Mon, 18 Apr 2005, Greg KH wrote:
> >
> > Here's a small patch to commit-tree.c that does two things:
>
> Gaah, I really was hoping that people wouldn't feel like they have to lie
> about their committer information.
>
> I
I'm hacking on a simple web interface, cause I missed the bkweb too much.
It can't do much more than browse through the source tree and show the
log now, but that should change... :)
http://ehlo.org/~kay/gitweb.pl?project=linux-2.6
How can I get the files touched with a changeset and the corresp
On Mon, 2005-04-18 at 19:16 -0500, James Bottomley wrote:
> Yes, that's what I did to get back to the commit just before the
> merge:
>
> fsck-cache --unreachable 54ff646c589dcc35182d01c5b557806759301aa3|awk
> '/^unreachable /{print $2}'|sed 's:^\(..\):.git/objects/\1/:'|xargs rm
I was actually d
On Mon, 18 Apr 2005, Greg KH wrote:
>
> Here's a small patch to commit-tree.c that does two things:
Gaah, I really was hoping that people wouldn't feel like they have to lie
about their committer information.
I guess we don't have much choice, but I'm not happy about it.
Linus
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> Then the git-pull... script actually does the merge and the resulting
> tree checks out against BK
So?
What do you intend to do with all the other stuff I've already put on top?
Yes, I can undo my tree, but my tree has had more stuff in it since
On Tue, 2005-04-19 at 10:10 +1000, David Woodhouse wrote:
> On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
> > Git does work like BK in the way that you cannot remove history when you
> > have distributed it. Once it's there, it's there.
>
> But older history can be pruned, and there's r
On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
> The patches from you I have in my tree are:
>
> scsi: add DID_REQUEUE to the error handling
> zfcp: add point-2-point support
> [PATCH] Convert i2o to compat_ioctl
> [PATCH] kill old EH constants
> [PATCH] scs
Here's a small patch to commit-tree.c that does two things:
- allows the committer email address and name to be overridden
by environment variables (if you don't like the environment
variable names I've used (COMMIT_AUTHOR_NAME,
COMMIT_AUTHOR_EMAIL), feel free
On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
> Git does work like BK in the way that you cannot remove history when you
> have distributed it. Once it's there, it's there.
But older history can be pruned, and there's really no reason why an
http-based 'git pull' couldn't simply refrain
On 4/18/05, randy_dunlap <[EMAIL PROTECTED]> wrote:
> Here's the beginnings of yet another git usage/howto/tutorial.
>
> It can grow or die... I'll gladly take patches for it,
> or Pasky et al can merge more git plumbing and toilet usages
> into it, with or without me.
>
> http://www.xenotime.net
On Mon, 2005-04-18 at 21:04 +, [EMAIL PROTECTED] wrote:
> The other is "replace very instace of identifier `foo` with identifier`bar`".
That could be derived, however, by a particularly smart parser [1].
Alternately, that itself could be embedded in the comment for patches
sourced from darcs.
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> It looks like the merge tree has contamination from the scsi-misc-2.6
> tree ... possibly because the hosting system got the merged objects when
> I pushed.
Nope, the way I merge, if I get a few objects it shouldn't matter at all.
I'll just look
Dear diary, on Tue, Apr 19, 2005 at 12:16:52AM CEST, I got a letter
where Russell King <[EMAIL PROTECTED]> told me that...
> However, it seems that git diff can't handle new files appearing
> yet.
Fixed. :-)
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: a
> Hell no.
>
> The commit _does_ specify the patch uniquely and exactly, so I really
> don't see the point. You can always get the patch by just doing a
>
> git diff $parent_tree $thistree
>
> so putting the patch in the comment is not an option.
Er... no.
One of darcs' big points is that
Patch 1/6 in the series has already cleaned the interface to
call sq_expand(), but the comment before that function still
carries the stale interface warning. Remove it.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
show-diff.c |3 ---
1 files changed, 3 deletions(-)
show-diff.c: b
On Tue, 19 Apr 2005, Petr Baudis wrote:
>
> What is actually a little annoying is having to cd ,,merge and then
> back, though. I don't know, but the current pull-merge script does not
> bother with the temporary merge directory neither, even though Linus
> wanted it. Linus, do you still do? ;-)
On Mon, 18 Apr 2005, Russell King wrote:
>
> Ok, since the last one was soo successful, and I'm up for more
> punishment, here's another attempt. The diffstat is rather
> interesting in this one, claiming no changes. It should look
> like this:
>
> arch/arm/lib/bitops.h | 33 +++
Dear diary, on Tue, Apr 19, 2005 at 01:23:24AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> However the "Getting object database" part trashed this symlink
> when I tried to pull from my other repo locally. I am wondering
> it the following might be a better alte
On Mon, Apr 18, 2005 at 04:16:45PM -0700, Linus Torvalds wrote:
>
>
> On Mon, 18 Apr 2005, Greg KH wrote:
> >
> > Anyway, I try it this way and get:
>
> You should update to the newest version anyway..
>
> > $ dotest ~/linux/patches/usb/usb-visor-tapwave_zodiac.patch
> >
> > Appl
> "LT" == Linus Torvalds <[EMAIL PROTECTED]> writes:
LT> Merged. Here's the command line history:
LT> ~/git/git-pull-script \
LT>rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git
Maybe it is just me, but I have this setup:
$ /bin/ls -lF .git
total 20
-rw-rw-r-
This makes init-db work for common object database.
Signed-Off-By: Aaron Straus <[EMAIL PROTECTED]>
init-db.c: aa00fbb1b95624f6c30090a17354c9c08a6ac596
--- a/init-db.c
+++ b/init-db.c
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
sha1_dir = getenv(DB_ENVIRONMENT);
if (sha1_dir
On Mon, 18 Apr 2005, Greg KH wrote:
>
> Anyway, I try it this way and get:
You should update to the newest version anyway..
> $ dotest ~/linux/patches/usb/usb-visor-tapwave_zodiac.patch
>
> Applying USB: visor Tapwave Zodiac support patch
>
> fatal: preparing to update file 'dri
On Mon, 2005-04-18 at 14:39 -0700, Linus Torvalds wrote:
> > Linus, the rc-fixes repo is ready for applying ... it's the same one I
> > announced on linux-scsi and lkml a while ago just with the git date
> > information updated to be correct (the misc one should wait until after
> > 2.6.12 is final
Dear diary, on Tue, Apr 19, 2005 at 12:59:52AM CEST, I got a letter
where Russell King <[EMAIL PROTECTED]> told me that...
> In the case I highlighted, we don't want to end up having to require
> user intervention. This is a common case here, and was one which was
> entirely scripted with BK.
Wel
On Mon, 18 Apr 2005, Greg KH wrote:
>
> Hm, have you pushed all of the recent changes public?
Oops. Obviously not. Will fix.
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.
On Tue, Apr 19, 2005 at 12:48:52AM +0200, Petr Baudis wrote:
> Dear diary, on Mon, Apr 18, 2005 at 11:53:57PM CEST, I got a letter
> where Russell King <[EMAIL PROTECTED]> told me that...
> > Maybe Petr can improve the error handling, and incorporate it (or at
> > least some of it) into git-pasky
>
Dear diary, on Mon, Apr 18, 2005 at 11:53:57PM CEST, I got a letter
where Russell King <[EMAIL PROTECTED]> told me that...
> Maybe Petr can improve the error handling, and incorporate it (or at
> least some of it) into git-pasky
This does not need to touch git pull at all now; all the relevant log
[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
Catalin Marinas wrote:
Ingo Molnar <[EMAIL PROTECTED]> wrote:
i've converted the Linux kernel CVS tree into 'flat patchset' format,
which gave a series of 28237 separate patches. (Each patch represents a
changeset, in the order they were applied. I've used the cvsps
utility.)
AFAIK, cvsps uses t
Dear diary, on Tue, Apr 19, 2005 at 12:18:07AM CEST, I got a letter
where David Greaves <[EMAIL PROTECTED]> told me that...
> Petr Baudis wrote:
>
> > Thanks. Could you please send the patches signed off and either with
> > content-disposition: inline or in the mail body?
> Is this OK.
> Thunderbi
This is against git-pasky-0.5, just a little typo.
gitstatus.sh: d5d0f82aca3f668655469cefb08a4d06049f2580
--- gitstatus.sh
+++ gitstatus.sh2005-04-18 16:31:26.0 -0600
@@ -12,7 +12,7 @@
} | sort -z -k 2 | xargs -0 sh -c '
while [ "$1" ]; do
tag=${1% *};
- filename
Dear diary, on Tue, Apr 19, 2005 at 12:18:12AM CEST, I got a letter
where David Greaves <[EMAIL PROTECTED]> told me that...
> Junio C Hamano wrote:
>
> >DG> It allows:
> >DG> find src -type f | git add -
> >
> >I am slow today, but have you considered using xargs?
> >
> >
> >
> yep thanks :)
> I
Dear diary, on Tue, Apr 19, 2005 at 12:16:52AM CEST, I got a letter
where Russell King <[EMAIL PROTECTED]> told me that...
> Ok, since the last one was soo successful, and I'm up for more
> punishment, here's another attempt. The diffstat is rather
> interesting in this one, claiming no changes.
Hello,
so here finally goes git-pasky-0.5, my set of scripts upon Linus
Torvald's git, which aims to provide a humanly usable interface, to a
degree similar to a SCM tool. You can get it at
http://pasky.or.cz/~pasky/dev/git/
See the READMEs etc for some introduction.
This contai
> "DG" == David Greaves <[EMAIL PROTECTED]> writes:
DG> ... neither
DG> git add .
DG> nor
DG> git add -r .
DG> worked.
These would be much much much nicer than pipe the list of
filenames from stdin which reminds me of cpio ;-).
-
To unsubscribe from this list: send the line "unsubscribe git"
Junio C Hamano wrote:
DG> It allows:
DG> find src -type f | git add -
I am slow today, but have you considered using xargs?
yep thanks :)
I know you _could_ do it with xargs - but you _could_ use the raw git
commands too. This is a "be nice to the user" layer and I was
'surprised' that neithe
Petr Baudis wrote:
Thanks. Could you please send the patches signed off and either with
content-disposition: inline or in the mail body?
Is this OK.
Thunderbird isn't the best for attaching patches.
I think it would be cleaner to do the testing for the dash in the for
loop, so that I can do git
Ok, since the last one was soo successful, and I'm up for more
punishment, here's another attempt. The diffstat is rather
interesting in this one, claiming no changes. It should look
like this:
arch/arm/lib/bitops.h | 33 +
1 files changed, 33 insertions(+)
Ho
On Mon, Apr 18, 2005 at 03:05:41PM -0700, Greg KH wrote:
> On Mon, Apr 18, 2005 at 08:42:14AM -0700, Linus Torvalds wrote:
> >
> >
> > On Mon, 18 Apr 2005, Greg KH wrote:
> > >
> > > On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
> > > >
> > > > Tools absolutely matter. And it w
On Mon, 18 Apr 2005, Petr Baudis wrote:
>
> So, I'm confused. Why did you introduce unpack-file instead of doing
> just this?
It was code that I already had (ie the old code from "merge-cache" just
moved over), and thanks to that, I don't have to worry about broken
"mktemp" crap in user space..
On Mon, Apr 18, 2005 at 08:42:14AM -0700, Linus Torvalds wrote:
>
>
> On Mon, 18 Apr 2005, Greg KH wrote:
> >
> > On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
> > >
> > > Tools absolutely matter. And it will take time for us to build up that
> > > kind of helper infrastructur
On Mon, 18 Apr 2005, Russell King wrote:
> >
> > # Get the trees associated with those commits
> > common_tree=tree=$(cat-file commit $common | sed 's/tree //;q')
> > head_tree=tree=$(cat-file commit $head | sed 's/tree //;q')
> > merge_tree=tree=$(cat-file commit $merge | sed 's
Dear diary, on Mon, Apr 18, 2005 at 11:19:46PM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> I suspect that I should just pass in the SHA1 of the files to the
> "merge-one-file-script" from "merge-cache", rather than unpacking it.
> After all, the merging script
On Mon, 18 Apr 2005, Russell King wrote:
>
> Since this happened, I've been working out what state my tree is in,
> and I restored it back to a state where I had one dangling commit head,
> which was _my_ head.
For the future, if your tree gets messed up to the point where you say
"screw it" a
On Mon, Apr 18, 2005 at 08:23:16AM -0700, Linus Torvalds wrote:
> NOTE NOTE NOTE! This is untested! I'm writing this within the email
> editor, so do _not_ do this on a tree that you care about.
It did the right thing for me at least!
> #!/bin/sh
> #
> # use "$1" or something i
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> As of today, I have two SCSI git trees operational:
>
> rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git
Merged. Here's the command line history:
~/git/git-pull-script
rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git
On Mon, Apr 18, 2005 at 10:23:32AM +0100, Russell King wrote:
> On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
> > On Sun, 17 Apr 2005, Russell King wrote:
> > > I pulled it tonight into a pristine tree (which of course worked.)
> >
> > Goodie.
>
> Note the "pristine". Now comes
On Mon, 18 Apr 2005, James Bottomley wrote:
>
> I had a problem with the SCSI tree in that there's a file removal in one
> branch. Your git-merge-one-file-script wouldn't have handled this
> correctly: It seems to think that the file must be removed in both
> branches, which is wrong.
Yes, I a
> "DG" == David Greaves <[EMAIL PROTECTED]> writes:
DG> Hi Petr
DG> Thankyou for the help earlier - problem resolved.
DG> I have a trivial patch (attached).
DG> It allows:
DG> find src -type f | git add -
I am slow today, but have you considered using xargs?
-
To unsubscribe from this li
> ...and this is precisely why ls-tree actually outputs those "blob" and
> "tree" tags. ;-)
Doh!
Here's a fresh copy with "if [ $tag = tree ]". I just used it to pull
from Linus into an "empty" directory (just ran init-db to make the .git
.git/objects and .git/objects/xx directories).
-Tony
#
Dear diary, on Mon, Apr 18, 2005 at 10:39:00PM CEST, I got a letter
where David Greaves <[EMAIL PROTECTED]> told me that...
> Hi Petr
Hi,
> Thankyou for the help earlier - problem resolved.
>
> I have a trivial patch (attached).
>
> It allows:
> find src -type f | git add -
>
> and fixes git s
Hi Petr
Thankyou for the help earlier - problem resolved.
I have a trivial patch (attached).
It allows:
find src -type f | git add -
and fixes git status not reporting added files properly (on my debian
system it only reported the first file in .git/add-queue)
Should I send this as a patch or as
This patch is optional. It adds -R option to obtain reverse diff.
It may be useful in the merge workflow. After the base of the working
directory is merged and commited, in the working directory:
$ read-tree
$ show-diff -R
to re-validate if upstream changes make sense, and/or revert o
This patch is optional. If makes the diff output formatting
options customizable via the environment variables. The default
is still the Linux kernel style.
To be applied on top of:
[PATCH 1/6] show-diff.c: clean up private buffer use.
[PATCH 2/6] show-diff.c: check unreadbale blob.
[PATCH 4/6] show-diff.c: adjust default format for the Linux kernel.
This patch adjusts the default output format of show-diff to match
the Linux kernel style, recommended in Documentation/SubmittingPatches.
To be applied on top of:
[PATCH 1/6] show-diff.c: clean up private buffer use.
[
[PATCH 3/6] show-diff.c: simplify show_diff_empty.
This patch removes the custom diff generation code from the
show_diff_empty() function. Instead, just use show_differences().
This reduces the code size; but more importantly, it is needed for
the later patch to give diff options.
To be applied
[PATCH 2/6] show-diff.c: check unreadbale blob.
This patch fixes show-diff to detect unreadable blob and warn
instead of going ahead and crashing.
To be applied on top of:
[PATCH 1/6] show-diff.c: clean up private buffer use.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
show-diff
[PATCH 1/6] show-diff.c: clean up private buffer use.
This patch fixes sq_expand() and show_differences() not to use and
hold onto its privately allocated buffer, which was a misguided
attempt to reduce calls to malloc but made later changes harder.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED
1 - 100 of 153 matches
Mail list logo
