So, last week I get hornswaggled into picking my kid up from school. I arrive a bit early, so I actually park the car and wander into the classroom just before it all lets out. Now this is a private school for special needs kids, so painting and staining gourds with pictures of Bono burn etched into them wasn't unusual behavior. What _is_ unusual, though, is the set of names on the side of the whiteboard, about 20 of them: William Shakespeare Albert Einstein Zeus Edgar A...

It's OK with me. :-) jdl -

Can someone remind me what the deprecated git-rev-tree command did, or how this should be fixed up to use newer git commands? I'm trying to get git-changes-script working, but all the variants I've found on the web use this deprecated tool. Any clues ? Dave -

It was basically the same as "git-rev-list", except: - it output the date (as a raw number) in front, so pretty much everybody ended up using "cut" to remove it, sometimes after sorting the output numerically. Sorting numerically is unnecessary with git-rev-list, since the output is already sorted (not necessarily exactly by date, but by "recency" and/or by other even stricter sorting rules) - it was limited to a certain number of heads maximum (I forget, but I t...

You've got the right "linus" commit. However, are you aware that I did pull from you? If you don't have No, the above will have created the "linus" branch as needed. Linus -

This describes a real problem I've had twice in the last two years while tracking Linus's kernel tree: I update my local kernel sources every morning using cg-update (formerly bk-pull) and compile and install and reboot the new kernel. Okay. On rare occasions I get a kernel panic on reboot. So... I know that something Linus committed in the last 24 hours is responsible for the problem. The last two times this happened I was able to guess which commit caused the problem and I emailed the dev...

git-bisect(1). -

Remember object directories known to exist in the remote repo and don't bother trying to create them. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> --- http-push.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) applies-to: 27732582039ada9c7781ce5a1583ee682e0452c6 9904bed158b8c297bfba8a8cff87644619688b62 diff --git a/http-push.c b/http-push.c index 96d2778..4d41b4f 100644 --- a/http-push.c +++ b/http-push.c @@ -56,6 +56,7 @@ static int active_requests = ...

In the -fetch counterparts, the trailing slash is added by git-fetch.sh, does this belong in the get_remote_url() function in git-parse-remote.sh? I've only pushed with DAV, so I'm not sure whether that would break anything else. -- For a successful technology, reality must take precedence over public relations, for nature cannot be fooled. -

Guys, I just hit my first real rename conflict, and very timidly tried the "recursive" strategy in the hopes that I wouldn't need to do things by hand. It resolved things beautifully. Good job. My only worry is that I don't read python, so I don't really know how it does what it does, which makes me nervous. Can somebody (Fredrik?) add some documentation about the merge strategy and how it works. Considering that the stupid resolve strategy really requires you to know how git work...

This is the first time I see you pleased by something in git that was done without very close supervision from you. All the credits for this one goes to Fredrik, of course, but it is a small victory for me as the maintainer as well, and I am very Another thing to consider is if it is fast enough for everyday trivial merges. In any case, I've been thinking about teaching git-merge to look into .git/config to make it overridable which strategy to use by default. This would eliminate the hardco...

Sorry, that is not what I meant to say at all. You used to micromanage, but it was _very_ good for git back then. I admit that only once I found you too picky and difficult to work with while I was fixing a bad premature-free bug in the diffcore-rename code, but overall your attention to detail well paid off. Since I inherited the project, we added quite a lot of stuff, but I was still unsure if we are making good progress, or just stagnating with only small enhancements and obvious fixes. ...

Sounds like a good idea. How about something like the following? -- It isn't really interesting to know about the renames that have already been committed to the branch you are working on. Furthermore, the 'git-apply --stat' at the end of git-(merge|pull) will tell us about any renames in the other branch. With this commit only renames which require a file-level merge will be printed. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> --- git-merge-recursive.py | 22...

Hi guys, I run into a weird problem when trying to update my clone of the linux-2.6 repository from Linus: --- # cg-update -f 17:09:00 URL:http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/HEAD [41/41] -> "refs/heads/.origin-fetching" [1] Getting alternates list Getting pack list error: Unable to find 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c under http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/ Cannot obtain needed object 2ed5e6d09e266bd2288d49aaa...

Is this an issue with the two servers (or virtual servers?) behind the kernel.org DNS name being out of sync? Would it make sense to configure the individual servers to be http-alternates of each other? -- For a successful technology, reality must take precedence over public relations, for nature cannot be fooled. -

I actually have no real idea, but the "object fetch failed" doesn't tell me anything besides that an object seems to be missing. Maybe this is a problem we have to live with when using the kernel.org mirroring. Regards Marcel -

The similiarities are just because they're both SCM's. It pretty much It was just done in the list. If you browse the archives you'll find a lengthy discussion. You might also want to read the Certainly. Prepare to spend a week or so letting the command-structure and syntax sink in though. It's a steep learning curve at first, although the git tutorial (Documentation/tutorial.txt) nicely cuts it in half. The documentation is also available for online browsing at [ message continues ]

Signed-off-by: Jon Loeliger <jdl@freescale.com> --- Documentation/tutorial.txt | 226 +++++++++++++++++++++++++++----------------- 1 files changed, 138 insertions(+), 88 deletions(-) applies-to: 5ebec76efaa72d55bc18eaadad6e85f03e8173a3 291987d85077f3ce3a9beefe39ab5730262c2317 diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 6d2c153..22f21fd 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -36,14 +36,16 @@ To start up, create a ...

GIT 0.99.9e maintenance release is found at the usual places: RPM, tarballs, and deb: http://www.kernel.org/pub/software/scm/git/ With git, fetch maint branch from git://git.kernel.org/pub/scm/git/git.git/ It contains everything from the master branch. Since we seem to be shelving the separate git binary directory idea indefinitely, what we have here is pretty much what will be in 1.0, from the source code POV. - http-push seems to still have a bug or two but that is to be expec...

e.g. GIT encapsulated in SOAP /me *ducks* and *runs* Ingo Oeser

Hi, I am reasonably sure that a run with valgrind will show the way to a stable http-push. It is just a little memory corruption: the rest works wonderfully. Ciao, Dscho -

Dear diary, on Mon, Nov 07, 2005 at 01:11:33AM CET, I got a letter Ok, I'm not a die-hard proponent of this change (the genesis is that it comes from the ages before .mailmap was supported and was originally coupled with -n which disabled the internal mappings - but then .mailmap got supported, I deemed -n useless but this still seemed worth something so I passed it along), but I think it can be useful - either when you want to work on readonly tree, or when you want to support custom mailmap in ad...

Dear diary, on Mon, Nov 07, 2005 at 03:56:07AM CET, I got a letter Well, on a second though, I don't think we should probably handle this at all, then. The whole logic for this in git-shortlog.perl seems to be dubious, so would be a requirement that we require the input to be from --pretty=short ok? Simpler code, no bugs, everyone happy, errors during applying (like stale From) immediately noticeable. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which i...

It definitely looks like it's doing a few requests in parallel and getting them mixed up. BTW, this repo is public and sitting on a box Host: locke.catalyst.net.nz Accept: */* * Connected to locke.catalyst.net.nz (202.78.240.39) port 80 * Couldn't find host locke.catalyst.net.nz in the .netrc file, using defaults * About to connect() to locke.catalyst.net.nz port 80 * Trying 202.78.240.39... > GET /git/moodle.git/objects/d9/6d5ee03a225ab4e750fb864dbea35d42c51b8b HTTP/1.1 Host: locke.catal...

Extra fork() and exec() problem still exists, but "git cmd" format have worked with "git diff-tree" and "git rev-list" for quite some time (since Jun 14th), so you might've always done it with dash but that is not a requirement. It looks like that both you and Pasky are not so enthusiastic about moving thing out of /usr/bin/, so let's keep things the way they are for 1.0 release and rethink when we do 2.0 (or whatever comes after 1.0). -