git, branch v1.3.3

Fix pack-index issue on 64-bit platforms a bit more portably.

2006-05-15T20:01:37Z

Apparently is not enough for uint32_t on OpenBSD; use "unsigned int" -- hopefully that would stay 32-bit on every platform we care about, at least until we update the pack-index file format. Our sha1 routines optimized for architectures use uint32_t and expects '#include ' to be enough, so OpenBSD on arm or ppc might have similar issues down the road, I dunno. Signed-off-by: Junio C Hamano

Install git-send-email by default

2006-05-15T20:00:28Z

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and 4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no longer requires any non-standard Perl modules, so there's no reason to special-case it. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

Fix compilation on newer NetBSD systems

2006-05-15T20:00:01Z

NetBSD >=2.0 has iconv() in libc. A libiconv is not required and does not exist. See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0 [jc: with a bit of simplification later discussed on the list.] Signed-off-by: Dennis Stosberg Signed-off-by: Junio C Hamano

Merge branch 'fix' into maint

2006-05-15T07:49:25Z

* fix: Ensure author & committer before asking for commit message.

Ensure author & committer before asking for commit message.

2006-05-14T23:27:03Z

It's better to find out you need to fix your author and committer information before you enter a long commit message. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

Merge branch 'fix' into maint

2006-05-14T23:20:09Z

* fix: include header to define uint32_t, necessary on Mac OS X

include header to define uint32_t, necessary on Mac OS X

2006-05-14T23:19:52Z

Signed-off-by: Junio C Hamano

git config syntax updates

2006-05-13T21:00:16Z

This updates the hierarchical section name syntax to [section+""] where the only rule for "randomstring" is that it can't contain a newline, and if you really want to insert a double-quote, you do it with \". It turns that into the section name "secion.randomstring". The "section" part is still case insensitive, but the "randomstring" part is case sensitive. So you could use this for things like [email "torvalds@osdl.org"] name = Linus Torvalds if you wanted to do the "email->name" conversion as part of the config file format (I'm not claiming that is sensible, I'm just giving it as an insane example). That would show up as the association email.torvalds@osdl.org.name -> Linus Torvalds which is easy to parse (the "." in the email _looks_ ambiguous, but it isn't: you know that there will always be a single key-name, so you find the key name with "strrchr(name, '.')" and things are entirely unambiguous). Repo-config is updated to be able to parse the new format, and also write things out in the new format. [jc: rolled two patches from Linus and one fix-up from Sean into one, with additional adjustments for t/t1300 test to check the case insensitiveness of section base and variable and case sensitiveness of the extended section part. Then stripped some part off to make the result applicable to the stale 1.3.X series that does not have recent enhancements. ] Signed-off-by: Linus Torvalds Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

Another config file parsing fix.

2006-05-13T21:00:16Z

If the variable we need to store should go into a section that currently only has a single variable (not matching the one we're trying to insert), we will already be into the next section before we notice we've bypassed the correct location to insert the variable. To handle this case we store the current location as soon as we find a variable matching the section of our new variable. This breakage was brought up by Linus. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

checkout: use --aggressive when running a 3-way merge (-m).

2006-05-13T21:00:15Z

After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: Junio C Hamano