git mailing list

FromSubjectsort iconDate
Nicolas Pitre
[PATCH] clean up add_object_entry()
This function used to call locate_object_entry_hash() _twice_ per added object while only once should suffice. Let's reorganize that code a bit. Signed-off-by: Nicolas Pitre <nico@cam.org> --- diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 687b4b5..bc5f232 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -781,12 +781,19 @@ static unsigned name_hash(const char *name) static int add_object_entry(const unsigned char *sha1, unsigned hash, int exclud...
Apr 10, 10:54 pm 2007
Alexander Litvinov
Rebase, please help
Hello list. I have found that rebase have (new) option : --merge Looking at the code show me that regular rebase is a simply format-patch and am but --merge (or -s) use some merge stratyegy to merge changes between two commits into current head. What is --merge for ? Will the result be the same ? -
Apr 10, 9:52 pm 2007
H. Peter Anvin
MinGW port of git downloadable from anywhere?
Hi, Just wondering if there is a canonical place to download the MinGW port of git for non-git users... ideally precompiled, since a lot of Windows users probably won't have MinGW installed? Or is the port too fragile for that, still? -hpa -
Apr 10, 6:51 pm 2007
Robin H. Johnson
[PATCH] Add sendmail -f support to git-send-email.
Some mailing lists use the envelope sender instead of the actual from address, and this can be broken in git-send-email. This patch sets the -f argument to the sendmail binary, using the address of the patch author. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> --- git-send-email.perl | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index ae50990..2436aec 100755 --- a/git-send-email.perl +++ b/git-send-...
Apr 10, 6:02 pm 2007
Frank Lichtenheld
Re: [PATCH] Add sendmail -f support to git-send-email.
At least some MTAs (exim is the one I know for sure) can restrict -f usage to some users and deny it for others. Don't know how much this would really be a problem, but using -f unconditionally might be a bad idea none-the-less. Gruesse, -- Frank Lichtenheld <frank@lichtenheld.de> www: http://www.djpig.de/ -
Apr 10, 6:38 pm 2007
Junio C Hamano
Re: [PATCH] Add sendmail -f support to git-send-email.
I thought I saw the '-f' patch somewhere on the list in the last several weeks and there was a discussion on this topic that followed the patch. Am I hallucinating, or was it not applied because there were some issues? -
Apr 10, 7:00 pm 2007
Frank Lichtenheld
Re: [PATCH] Add sendmail -f support to git-send-email.
Can't find anything in the archives. So either I completly suck at searching, or it is at least several months old, or you are hallucinating :) Gruesse, -- Frank Lichtenheld <frank@lichtenheld.de> www: http://www.djpig.de/ -
Apr 10, 8:38 pm 2007
Robin H. Johnson
Re: [PATCH] Add sendmail -f support to git-send-email.
In those cases, the sendmail binary should fail gracefully, and then you know that at least your email isn't lost into the ether. --=20 Robin Hugh Johnson Gentoo Linux Developer & Council Member E-Mail : robbat2@gentoo.org GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
Apr 10, 6:42 pm 2007
Robin H. Johnson
Re: [PATCH] Add sendmail -f support to git-send-email.
Weird mail header here: "Cc: junkio@cox.net, Robin@orbis-terrarum.net, H.Johnson@orbis-terrarum.net= , robbat2@gentoo.org" Looks like git-send-email didn't put the quotation marks around the CC address, so my MTA broke it up (and tried to expand each part locally). --=20 Robin Hugh Johnson E-Mail : robbat2@orbis-terrarum.net Home Page : http://www.orbis-terrarum.net/?l=3Dpeople.robbat2 ICQ# : 30269588 or 41961639 GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
Apr 10, 6:06 pm 2007
Robin H. Johnson
[PATCH] Make envelope-sender fully configurable.
From: Robin H. Johnson <robbat2@gentoo.org> This patch makes envelope sender fully configurable, and also allows it to be use with Net::SMTP instead of just the sendmail binary. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> --- git-send-email.perl | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 2436aec..133a844 100755 --- a/git-send-email.perl +++ b/git-send-email.perl ...
Apr 10, 6:02 pm 2007
Robin H. Johnson
Envelope sender patches for git-send-email
This patch set is both a testcase, and a useful addition. Some mailing lists (git@vger included) use the envelope sender to determine is posts are allowed, and depending how use git-send-email, the envelope sender might not be the address that you are subscribed with! -
Apr 10, 6:00 pm 2007
Nicolas Pitre
[PATCH 13/10] tests for various pack index features
This is a fairly complete list of tests for various aspects of pack index versions 1 and 2. Tests on index v2 include 32-bit and 64-bit offsets, as well as a nice demonstration of the flawed repacking integrity checks that index version 2 intend to solve over index version 1 with the per object CRC. Signed-off-by: Nicolas Pitre <nico@cam.org> --- OK this should really be the last patch for this topic. diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh new file mode 100755 ...
Apr 10, 4:26 pm 2007
Junio C Hamano
Re: [PATCH 13/10] tests for various pack index features
Is there a way for our tests to be a bit more stable than urandom? I saw on the first run fsck was OOM-killed, but the second and subsequent run did not. It's a bit hard to diagnose. -
Apr 10, 10:57 pm 2007
Yann Dirson
[PATCH] Add "stg bury" command, with the functionnality of c...
This is the rewrite in python of by stg-sink written in perl. I changed the name to "bury" since it seems more descriptive of what it does, despite being less of an opposite to "float" than "sink" was. Signed-off-by: Yann Dirson <ydirson@altern.org> --- Documentation/stg-bury.txt | 49 +++++++++++++++++++++++++++++++ Documentation/stg.txt | 2 + contrib/stg-sink | 44 ---------------------------- contrib/stgit-completion.bash | 1 + stgit/commands/bu...
Apr 10, 2:27 pm 2007
Sergio Callegari
git fsck and new repos / backup repos
Hi, just posting a very very minor thing, that anyway might be easy to improve... consider the following cases: 1) Empty repo mkdir Foo cd Foo git --bare init git --bare fsck error: HEAD is not a symbolic ref error: No default references Should this be an error...? Of course fsck is not happy: HEAD points to master, but master does not exist. However, the newbie might find it weird that git complains over a brand new repo it has just made. BTW also gitk dies badly in this case. ...
Apr 10, 2:27 pm 2007
Junio C Hamano
Re: [PATCH 4/5] merge-recursive: handle D/F conflict case mo...
Perhaps, but I think the bigger issue is that existing D/F or F/D conflict detection is simply buggy, and this patch shouldn't be needed if they were working correctly. -
Apr 10, 2:20 pm 2007
Ramsay Jones
Cygwin and git 1.5.1
Hi Junio, I recently upgraded to 1.5.1, via tarball as usual, without much problem. The only problem being the "printf format warnings" issue, which prevents me building with -Werror. I have included, below, an updated version of my patch from the 1.5.0 series. We agreed last time that this patch is not the correct solution to this problem in general (but it works on cygwin!), so this is *not* intended for submission. I just wanted to document the problem. As before, I don't really have a soluti...
Apr 10, 1:39 pm 2007
H. Peter Anvin
Re: Cygwin and git 1.5.1
The excruciatingly correct way to do this is to use the macros defined in <inttypes.h>, so for uint32_t one should use %"PRNu32" instead of %u, for example. -hpa -
Apr 10, 6:44 pm 2007
Alex Riesen
[PATCH] allow git-update-index work on subprojects
At least git-update-index should work. --- builtin-update-index.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin-update-index.c b/builtin-update-index.c index 47d42ed..55c9f93 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -94,12 +94,10 @@ static int process_file(const char *path) path); } } - if (0 == status) - return error("%s: is a directory - add files inside instead", - path); -...
Apr 10, 9:39 am 2007
Alex Riesen
[PATCH] Allow git-update-index work on subprojects
Also, make "git commit -a" work with modifications of subproject HEADs. --- This one works with update-index --remove (which is what git-commit -a uses). It is ugly. I tried to keep the "F -> D/F" behaviour of update-index. Still have to check if "F -> Subproject" works. builtin-update-index.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/builtin-update-index.c b/builtin-update-index.c index eba756d..d075d50 10064...
Apr 10, 7:19 pm 2007
Junio C Hamano
Re: [PATCH] Allow git-update-index work on subprojects
If I used to have a symlink S and now the filesystem has a file S/F which I am running "update-index --add --remove" on, what happens? If I have a subproject at path P, and mistakenly try to add path P/F with "update-index --add --remove P/F", it should be refused, shouldn't it? -
Apr 10, 10:55 pm 2007
Martin Langhoff
Oddities cloning over http
Cloning over http this repo, using git v1.5.0.5 and v1.5.1.106.ga32037 http://git.catalyst.net.nz/git/moodle-r2.git The clone doesn't complete successfully. - I don't get a checkout - It never creates .git/branches/origin - It never creates .git/refs/heads/master OTOH, it does fetch all the packfiles, and creates all the refs for the remote branches under .git/refs/remotes/origin/ hmmm...? I did run git-update-server-info on the server... martin -
Apr 10, 8:40 am 2007
Medve Emilian-EMMEDVE1
RE: Oddities cloning over http
Hi Martin, I've seen this behavior when the server repo files don't have the same owner/group as the one you're running the server with. That happened to me after I edited the config files. Cheers, Emil. -----Original Message----- From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On Behalf Of Martin Langhoff Sent: Tuesday, April 10, 2007 7:41 AM To: Git Mailing List Subject: Oddities cloning over http Cloning over http this repo, using git v1.5.0.5 and v1.5.1.106.g...
Apr 10, 9:12 am 2007
Martin Langhoff
Re: Oddities cloning over http
Ok - at least in my case, this seems to be related to problems fetching HEAD on the server, probably because apache doesn't allow symlinks. What I don't quite follow is where is the best place to check for this. The logic is a bit muddy. cheers, martin -
Apr 10, 7:28 pm 2007
Martin Langhoff
git-branch and git-remotes confusion
Hi, maybe I'm daft, or cogito has eaten my brain. The task at hand is really simple: clone from repo X, tracking branch Y (where branch Y != HEAD). The repo is http://git.catalyst.net.nz/git/moodle-r2.git , the branch is mdl18-olpc . With cg, this is trivial: cg-clone http://git.catalyst.net.nz/git/moodle-r2.git#mdl18-olpc which automagically gives me a "master" and "origin" pair of heads that do the right thing. Specifically, cg-update does the right thing. With git 1.5.x, I managed to...
Apr 10, 8:05 am 2007
Jeff King
Re: git-branch and git-remotes confusion
Your arguments to git-branch are backwards. It should be: git-branch --track my18-olpc origin/mdl18-olpc Also note that --track didn't show up until 1.5.1. Other than that, it should do what you expect (check out your .git/config before and after to see the impact of --track). -Peff -
Apr 10, 8:25 am 2007
Martin Langhoff
Re: git-branch and git-remotes confusion
thanks. And I'm reading the doco for 1.5.latest and it turns out I'm using 1.5.0.5 so that won't work either. hmmm. actually, I'm having another problem that is a bit more serious: cloning via http doesn't create a remotes/origin and doesn't perform the initial checkout. will post separately about this... martin -
Apr 10, 8:33 am 2007
Gerrit Pape
cogito selftests failures with git 1.5.1
Hi, while cogito 0.18.2 builds and selftests fine with git 1.4.4.4, the following selftests fail with 1.5.1 on Debian: t9105-fetch-local.sh:20, t9204-merge-weird-conflicts.sh:8,20. Is there still work done on cogito? Thanks, Gerrit. -
Apr 10, 6:16 am 2007
sbejar
Re: cogito selftests failures with git 1.5.1
They are already fixed in the master branch. At least the t9105 was a fix in the test suite. Santi -
Apr 10, 6:39 am 2007
Robin H. Johnson
Feature request - Subtree checkouts
Heya, I'm trying to dig at various issues that are potential holdups for migrating the Gentoo CVS tree into Git. Since shallow checkouts are now available, there's just one more thing that's missing: subtree checkouts. Not to be confused with sub-projects. If the master tree has this as some example contents: /foo /abc/... /bar/example /bar/baz/some-content We need to be able to check out arbitrary subtrees. So I might want to check out everything (as the CVS administrator), while one of ...
Apr 10, 3:44 am 2007
Shawn O. Pearce
Re: Feature request - Subtree checkouts
Yes. It has cut down on our spam, but it has also caused some things to be blocked, almost without good reason. ;-) I send a fair number of patches to this list (at times anyway) and am also unable to use git-send-email. If I have the email also CC back to me it does make it through a number of SMTP server hops, including my own spam filters, but it never makes it through the Git mailing list. So I dump the patches to an mbox with --stdout, open them up in mutt and resend them there. I've bo...
Apr 10, 9:20 am 2007
Junio C Hamano
Re: Feature request - Subtree checkouts
Well, we need to do something about this. I haven't seen Robin's patch neither on the list nor in my mailbox (if they were CC'ed to me). One thing that people need to be careful about is which SMTP server they use. I had an impression (I do not use send-email myself) that it defaulted to local MTA, so the mail trail would look like your local MTA receives from the MUA (which is send-email), which forwards it to whereever destination (or intermediaries). On the other hand, I suspect many peopl...
Apr 10, 4:28 pm 2007
Shawn O. Pearce
Re: Feature request - Subtree checkouts
I'm pretty sure the last time I tried git-send-email I had the MTA path exactly the same. My mutt sends to `localhost`, which forwards over an SSL channel to my colo'd spearce.org mail server, and that relays to the final destination. Hence spearce.org mail always originates from spearce.org. Now I ran git-send-email on a different system, but had it connect over SMTP to port 25 of the same system mutt runs on, so the initial Received line was different, but othewrise the mail path was the sam...
Apr 10, 7:41 pm 2007
Robin H. Johnson
Re: Feature request - Subtree checkouts
No, it's not SMTP path differences. I _know_ that my mail path is identical for git-send-email as well as my MUA, because I had problems with GIT and whitespace in email addresses initially ;-). Since I have access to all the mail servers in my path (home -> AUTH SMTP @ work -> wherever), I dug at the logs, and found that vger did indeed accept my email to the list, but the messages never turned up on the list. The only weirdness I saw in that, is that the envelope sender did not appear...
Apr 10, 5:10 pm 2007
Robin H. Johnson
Re: Feature request - Subtree checkouts
Ok, see my patch series for envelope sender, that is the source of the problem. --=20 Robin Hugh Johnson E-Mail : robbat2@orbis-terrarum.net Home Page : http://www.orbis-terrarum.net/?l=3Dpeople.robbat2 ICQ# : 30269588 or 41961639 GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
Apr 10, 6:04 pm 2007
Linus Torvalds
Re: Feature request - Subtree checkouts
ABSOLUTELY! There are a ton of spam blockers that simply *refuse* to accept email from people who just randomly send to port 25. For example, I will personally never see email that comes directly to my email address though an open mail relay *or* from something that appears to be just a random botnet PC (I forget the exact rule, since I'm hapily ignorant of MIS, but I think it boils down to requiring a good reverse DNS lookup). That's getting much more common. Most spam is done thr...
Apr 10, 4:56 pm 2007
alan
[OT] Re: Feature request - Subtree checkouts
Depending on your definition of "good". I run my mail server off my DSL line. I prefer having control over my mail server instead of being chained to what my ISP provides. (The problems of having been a sysadmin for way too many years.) I don't have control over the reverse ip address, but I do over my DNS resolution. (Well, most of it. A couple domains are sitting on really old dns servers Which makes Greylisting a useful tool. However, some people define a "real SMTP host" as being t...
Apr 10, 5:33 pm 2007
Linus Torvalds
Re: [OT] Re: Feature request - Subtree checkouts
Well, the most common case (and the thing I *think* our spam software does here) is to just confirm that the reverse DNS lookup (that you want to do *anyway* for the "Received" headers for the email) will resolve back to the same IP (aka "FCrDNS"). It's also possible to just not accept mail if the reverse lookup indicates that the sending IP address is a dynamic address, which you can sometimes see from the hostname. I would suggest you *not* name your hosts to I'll take strict anti-s...
Apr 10, 6:12 pm 2007
Christer Weinigel
Re: [OT] Re: Feature request - Subtree checkouts
That would be a very bad idea I think. Doing that would lose quite a lot of small companies and individuals such as me that run a mail server but are unable to get the ISP to change the reverse DNS. For example I do have a fixed IP, but have an reverse DNS pointer which looks like 1-2-3-4-5a.foo.bar.bostream.se. Forcing everybody to send mail through their ISP (and I'm not even sure if my ADSL subscription includes such a service) would be a big loss. First of all its a philosophical thing, ...
Apr 10, 6:49 pm 2007
alan
Re: [OT] Re: Feature request - Subtree checkouts
I am in the same situation. I also have three domains. Which one do I pick? I can't afford to get an individual ip address for each. Virtual My ISP only reciently started to think about using greylisting. They route all their mail through a filter service that I do not trust. (Too many false positives. I also expect that all this talk about "forking children" would get me on some list somewhere.) I have more experience running mail servers than the people at my ISP. (Not their faul...
Apr 10, 7:20 pm 2007
David Lang
Re: [OT] Re: Feature request - Subtree checkouts
this isn't a problem. as long as you can lookup 1-2-3-4-5a.foo.bar.bostream.se. and get your IP address you pass this test. David Lang -
Apr 10, 6:56 pm 2007
alan
Re: [OT] Re: Feature request - Subtree checkouts
Greylisting dropped my spam level by at least 90%. RBLs have, for the most part, had far too many false positives to be useful. (If it was just me, it would not be so bad, but my wife gets mail on this server as well. I try pretty hard. However, some anti-spam methods share some of the same methods with dowsing and other witchcraft. What "looks like spam" seems pretty subjective at times. I do have a reason for being a bit negative about it. I once ran a very large development list b...
Apr 10, 6:30 pm 2007
Nicolas Pitre
[PATCH 12/10] validate reused pack data with CRC when possible
This replaces the inflate validation with a CRC validation when reusing data from a pack which uses index version 2. That makes repacking much safer against corruptions, and it should be a bit faster too. Signed-off-by: Nicolas Pitre <nico@cam.org> --- This completes the development for this patch series. I tested that this works as expected by manually corrupting a pack, etc. I intend to write real tests for this stuff of course, but at least the way should be completely clear for the...
Apr 10, 12:15 am 2007
Linus Torvalds
[PATCH 0/6] Initial subproject support (RFC?)
Ok, the following is a series of six patches that implement some very low-level plumbing for what I consider sane subproject support. NOTE! I want to make it very clear that this series of patches does not make subprojects "usable". They are very core plumbing that allows people to think about the issues, and shows how the low-level code could (and in my opinion, should) be done. Some of the early patches are just cleanups and very basic stuff required to actually get to the meat of it all...
Apr 10, 12:12 am 2007
Linus Torvalds
Re: [PATCH 0/6] Initial subproject support (RFC?)
Here is, for your enjoyment, the last patch I used to actually test this all. I do *not* submit it as a patch for actual inclusion - the other patches in the series are, I think, ready to actually be merged. This one is not. It's broken for a few reasons: - it allows you to do "git add subproject" to add the subproject to the index (and then use "git commit" to commit it), but even something as simple as "git commit -a" doesn't work right, because the sequence that "git com...
Apr 10, 12:46 am 2007
Alex Riesen
Re: [PATCH 0/6] Initial subproject support (RFC?)
The other thing which will be missed a lot (I miss it that much) is a subproject-recursive git-commit and git-status. It is very possible that the default should be different for the git-commit and git-status: git-commit is likely to have it off whereas git-status will very much depend on how fast the usual response is (or wished for). An integrator on very fast machine may like it on for both, a subproject developer can have it off for both (to avoid accidental commits and generally being not int...
Apr 10, 9:04 am 2007
Linus Torvalds
Re: [PATCH 0/6] Initial subproject support (RFC?)
Note that I was definitely planning on adding them too, but they are at a higher level. So the long-term plan is/was to add a flag to "git diff" (and "git ls-tree" etc) to say "recurse into subprojects". You cound perhaps even make that flag the default with some .git/config option, if your superproject is small enough. But this series of 6 (and the seventh ugly hack) is literally meant for just the really core object-handling stuff, and even there it's not really complete. For ...
Apr 10, 11:13 am 2007
Alex Riesen
Re: [PATCH 0/6] Initial subproject support (RFC?)
It is already "merged somewhere": as soon as the patches left landed on vger, it is not possible to loose (and even destroy) them. which also should fix switching between the branches with subprojects. -
Apr 10, 11:48 am 2007
Linus Torvalds
Re: [PATCH 0/6] Initial subproject support (RFC?)
Well, unless it hits something like Junios 'pu' (or 'next') branch, or somebody (like you?) ends up maintaining a repo with this, it's just unnecessarily hard to have lots of people working together on it.. I'm obviously interested in working on it, but at the same time, I don't expect to be a primary *user* of it, so I'm hoping others will come in and start looking at it. It looks promising that you're getting involved, but I suspect you may be a bit too optimistic when you say "just ...
Apr 10, 12:07 pm 2007
Junio C Hamano
Re: [PATCH 0/6] Initial subproject support (RFC?)
Well, I was planning to apply this directly on 'master' after giving them another pass. -
Apr 10, 3:32 pm 2007
previous daytodaynext day
April 9, 2007April 10, 2007April 11, 2007