f3dd5eae58cf3d0d944604af4c71a7043d5368fd Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/1b9bc5a7b7434d771726011613a00cb202bd9f44 1b9bc5a7b7434d771726011613a00cb202bd9f44 2006-05-15T13:01:37-07:00 2006-05-15T12:52:00-07:00 Fix pack-index issue on 64-bit platforms a bit more portably. Apparently <stdint.h> 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 <stdint.h>' to be enough, so OpenBSD on arm or ppc might have similar issues down the road, I dunno. Signed-off-by: Junio C Hamano <junkio@cox.net> 52b810b4963ce4c079df9c70dafd9523276f7618 Junio C Hamano junkio@cox.net e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8 Eric Wong normalperson@yhbt.net http://github.com/rtyler/slide-git/commit/f3dd5eae58cf3d0d944604af4c71a7043d5368fd f3dd5eae58cf3d0d944604af4c71a7043d5368fd 2006-05-15T13:00:28-07:00 2006-05-14T19:26:56-07:00 Install git-send-email by default 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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> c27ef50e832ccd84f3f05d4f184ea0d8cf9286ad Junio C Hamano junkio@cox.net c8df633b4edfe6915ea3a8651a08d93654c62f24 Dennis Stosberg dennis@stosberg.net http://github.com/rtyler/slide-git/commit/e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8 e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8 2006-05-15T13:00:01-07:00 2006-05-11T10:35:31-07:00 Fix compilation on newer NetBSD systems 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 <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 616f748b9c815776c7cb9273e774083a7a43b7d5 Junio C Hamano junkio@cox.net 3f22deb7f58dff426a0853de62cc553ec97d6bf8 ec4e69c06af3ecc38b9660b924e460689653487f Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/c8df633b4edfe6915ea3a8651a08d93654c62f24 c8df633b4edfe6915ea3a8651a08d93654c62f24 2006-05-15T00:49:25-07:00 2006-05-15T00:49:25-07:00 Merge branch 'fix' into maint * fix: Ensure author & committer before asking for commit message. 5153832c60cc8c4365f6374b1a99b9a6e883aa41 Junio C Hamano junkio@cox.net d9635e9c539465792b1920437b52fa8792a71650 Sean seanlkml@sympatico.ca http://github.com/rtyler/slide-git/commit/ec4e69c06af3ecc38b9660b924e460689653487f ec4e69c06af3ecc38b9660b924e460689653487f 2006-05-14T16:27:03-07:00 2006-05-13T20:09:32-07:00 Ensure author & committer before asking for commit message. 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 <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> 3381467f17fd3a579f60c67892b2597ab7b2d508 Junio C Hamano junkio@cox.net d14f776402d9f7040cc71ff6e3b992b2e019526a d9635e9c539465792b1920437b52fa8792a71650 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/3f22deb7f58dff426a0853de62cc553ec97d6bf8 3f22deb7f58dff426a0853de62cc553ec97d6bf8 2006-05-14T16:20:09-07:00 2006-05-14T16:20:09-07:00 Merge branch 'fix' into maint * fix: include header to define uint32_t, necessary on Mac OS X 281a426f68823461874bf3d418ef217210e229fa Junio C Hamano junkio@cox.net 66561f5a776f2343331fff5b98adff1000622f42 Ben Clifford benc@hawaga.org.uk http://github.com/rtyler/slide-git/commit/d9635e9c539465792b1920437b52fa8792a71650 d9635e9c539465792b1920437b52fa8792a71650 2006-05-14T16:19:52-07:00 2006-05-14T13:34:56-07:00 include header to define uint32_t, necessary on Mac OS X Signed-off-by: Junio C Hamano <junkio@cox.net> b62cd7fc86637c0fdb9de0c9eb5e362b981558e6 Junio C Hamano junkio@cox.net bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a Linus Torvalds torvalds@osdl.org http://github.com/rtyler/slide-git/commit/d14f776402d9f7040cc71ff6e3b992b2e019526a d14f776402d9f7040cc71ff6e3b992b2e019526a 2006-05-13T14:00:16-07:00 2006-05-09T12:24:02-07:00 git config syntax updates This updates the hierarchical section name syntax to [section<space>+"<randomstring>"] 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 <torvalds@osdl.org> Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> a047cb0c911b3bad3504861341fb1971503c697c Junio C Hamano junkio@cox.net 618faa1dc7cb5898473861c286391d0a4b043107 sean seanlkml@sympatico.ca http://github.com/rtyler/slide-git/commit/bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a 2006-05-13T14:00:16-07:00 2006-05-06T11:14:02-07:00 Another config file parsing fix. 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 <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> 4307fe678f27e6ba32a75832d9d99f8359e214b6 Junio C Hamano junkio@cox.net 66561f5a776f2343331fff5b98adff1000622f42 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/618faa1dc7cb5898473861c286391d0a4b043107 618faa1dc7cb5898473861c286391d0a4b043107 2006-05-13T14:00:15-07:00 2006-05-09T19:23:23-07:00 checkout: use --aggressive when running a 3-way merge (-m). 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 <junkio@cox.net> eb997ae55067b2a6a359316e0693055e159796a6 Junio C Hamano junkio@cox.net d1802851b0c112a065b43e3f83d631f867b7e1ce Dennis Stosberg dennis@stosberg.net http://github.com/rtyler/slide-git/commit/66561f5a776f2343331fff5b98adff1000622f42 66561f5a776f2343331fff5b98adff1000622f42 2006-05-13T10:43:16-07:00 2006-05-11T10:36:32-07:00 Fix git-pack-objects for 64-bit platforms The offset of an object in the pack is recorded as a 4-byte integer in the index file. When reading the offset from the mmap'ed index in prepare_pack_revindex(), the address is dereferenced as a long*. This works fine as long as the long type is four bytes wide. On NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing the offset produces garbage. [jc: taking suggestion by Linus to use uint32_t] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 1c480663e03984fd23226964e54eba7a7c6a9eb9 Junio C Hamano junkio@cox.net 28cc4ab4224164971a523e8a6c222b5ab2bae27d Linus Torvalds torvalds@osdl.org http://github.com/rtyler/slide-git/commit/d1802851b0c112a065b43e3f83d631f867b7e1ce d1802851b0c112a065b43e3f83d631f867b7e1ce 2006-05-09T19:22:25-07:00 2006-05-09T19:22:25-07:00 revert/cherry-pick: use aggressive merge. 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 <junkio@cox.net> a2916e2e9cd501f87c85dd0c37294fed4e199bed Junio C Hamano junkio@cox.net dbd0f7d3221fbf8e9943a114c11e5b5e5fc0c201 Yakov Lerner iler.ml@gmail.com http://github.com/rtyler/slide-git/commit/28cc4ab4224164971a523e8a6c222b5ab2bae27d 28cc4ab4224164971a523e8a6c222b5ab2bae27d 2006-05-09T06:28:59-07:00 2006-05-09T09:14:00-07:00 read-cache.c: use xcalloc() not calloc() Elsewhere we use xcalloc(); we should consistently do so. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> ff12a8ca1685e4adce6060df5feb7388eb883648 Junio C Hamano junkio@cox.net 31fff305bcc6db3b8082eac7fc9e441b27964fea Eric Wong normalperson@yhbt.net http://github.com/rtyler/slide-git/commit/dbd0f7d3221fbf8e9943a114c11e5b5e5fc0c201 dbd0f7d3221fbf8e9943a114c11e5b5e5fc0c201 2006-05-09T01:29:38-07:00 2006-05-09T01:08:23-07:00 apply: fix infinite loop with multiple patches with --index When multiple patches are passed to git-apply, it will attempt to open multiple file descriptors to an index, which means multiple entries will be in the circular cache_file_list. This change makes git-apply only open the index once and write the index at exit. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 0d3842b2a4759d09280477d7723e94631bc5f44c Junio C Hamano junkio@cox.net afb4ff206967c6b3e481994cc6d0d86139792169 Dmitry V. Levin ldv@altlinux.org http://github.com/rtyler/slide-git/commit/31fff305bcc6db3b8082eac7fc9e441b27964fea 31fff305bcc6db3b8082eac7fc9e441b27964fea 2006-05-08T16:25:33-07:00 2006-05-08T14:43:38-07:00 Separate object name errors from usage errors Separate object name errors from usage errors. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 1681e28441508afae3f3e1bf602c4b0914d9c820 Junio C Hamano junkio@cox.net 5d6a9f45e1ba78693cb0fbd5e9724b05d4e30e37 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/afb4ff206967c6b3e481994cc6d0d86139792169 afb4ff206967c6b3e481994cc6d0d86139792169 2006-05-08T13:46:53-07:00 2006-05-08T13:46:53-07:00 Documentation: {caret} fixes (git-rev-list.txt) Signed-off-by: Junio C Hamano <junkio@cox.net> 4887e2c2332241a7f6c0819e4c7ab87935e68c4d Junio C Hamano junkio@cox.net f8ba655ee4131e5c73c28a4ea854b24ce4058e1e Linus Torvalds torvalds@osdl.org http://github.com/rtyler/slide-git/commit/5d6a9f45e1ba78693cb0fbd5e9724b05d4e30e37 5d6a9f45e1ba78693cb0fbd5e9724b05d4e30e37 2006-05-08T10:54:30-07:00 2006-05-08T09:46:53-07:00 Fix "git diff --stat" with long filenames When we cut off the front of a filename to make it fit on the line, we add a "..." in front. However, the way the "git diff" code was written, we will never reset the prefix back to the empty string, so every single filename afterwards will have the "..." prefix, whether appropriate or not. You can see this with "git diff v2.6.16.." on the current kernel tree, since there are filenames with long names that changed there: [ snip snip ] Documentation/filesystems/vfs.txt | 229 .../firmware_class/firmware_sample_driver.c | 3 .../firmware_sample_firmware_class.c | 1 ...Documentation/fujitsu/frv/kernel-ABI.txt | 192 ...Documentation/hwmon/w83627hf | 4 [ snip snip ] notice how the two Documentation/firmware** filenames caused the "..." to be added, but then the later filenames don't want it, and it also screws up the alignment of the line numbering afterwards. Trivially fixed by moving the declaration (and initial setting) of the "prefix" variable into the for-loop where it is used. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 75e8f9f7b224a1f1bd1f68e1760da90773484b46 Junio C Hamano junkio@cox.net 178613c737f82489a1e2c387236731541fe19081 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/f8ba655ee4131e5c73c28a4ea854b24ce4058e1e f8ba655ee4131e5c73c28a4ea854b24ce4058e1e 2006-05-07T21:27:30-07:00 2006-05-07T21:27:30-07:00 Fix repo-config set-multivar error return path. This hopefully fixes the problem an earlier commit 5d8ee9ceb attemted to fix. Signed-off-by: Junio C Hamano <junkio@cox.net> 536ebc5b51a8bb486be4c9143e5206b955a776e3 Junio C Hamano junkio@cox.net cf9dc65368113caa28f2829e2ada5477fbb031ec Martin Waitz tali@admingilde.org http://github.com/rtyler/slide-git/commit/178613c737f82489a1e2c387236731541fe19081 178613c737f82489a1e2c387236731541fe19081 2006-05-07T15:35:50-07:00 2006-05-07T11:18:53-07:00 repack: honor -d even when no new pack was created If all objects are reachable via an alternate object store then we still have to remove all obsolete local packs. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 5664a7d05a43beb7f8ad1c1da1fe25f6414e105a Junio C Hamano junkio@cox.net 6fe31e2e4cdb7ed5333107174e23fbf2e226e370 Martin Waitz tali@admingilde.org http://github.com/rtyler/slide-git/commit/cf9dc65368113caa28f2829e2ada5477fbb031ec cf9dc65368113caa28f2829e2ada5477fbb031ec 2006-05-07T15:33:43-07:00 2006-05-07T11:19:09-07:00 clone: keep --reference even with -l -s Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> e3a58d8e1caba863f578844a9b7fe06f47339161 Junio C Hamano junkio@cox.net 5d8ee9ceb8912c83336191d32b8898943b8944b8 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/6fe31e2e4cdb7ed5333107174e23fbf2e226e370 6fe31e2e4cdb7ed5333107174e23fbf2e226e370 2006-05-07T15:32:51-07:00 2006-05-07T15:32:51-07:00 repo-config: document what value_regexp does a bit more clearly. Signed-off-by: Junio C Hamano <junkio@cox.net> 2cfde9f461d4c0bfee84875c9757058dadc8d3be Junio C Hamano junkio@cox.net 245f1029d674b95d63b5faea2269f98d28b3adb2 Pavel Roskin proski@gnu.org http://github.com/rtyler/slide-git/commit/5d8ee9ceb8912c83336191d32b8898943b8944b8 5d8ee9ceb8912c83336191d32b8898943b8944b8 2006-05-07T15:31:06-07:00 2006-05-07T14:36:12-07:00 Release config lock if the regex is invalid Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 7eb67e5f1ed36d10928e1566f3e8bfb9fb0fe30f Junio C Hamano junkio@cox.net e388c7382563b7497397c78bc078d0679dc891a8 Matthias Lederhofer matled@gmx.net http://github.com/rtyler/slide-git/commit/245f1029d674b95d63b5faea2269f98d28b3adb2 245f1029d674b95d63b5faea2269f98d28b3adb2 2006-05-07T13:55:36-07:00 2006-05-07T10:32:53-07:00 core-tutorial.txt: escape asterisk Signed-off-by: Junio C Hamano <junkio@cox.net> 6a6f51aebd3b674004d2442cd406ded3cc25d81b Junio C Hamano junkio@cox.net 7ebdba614223f867d3f19963647406df1d0e5ce0 Junio C Hamano junkio@cox.net http://github.com/rtyler/slide-git/commit/e388c7382563b7497397c78bc078d0679dc891a8 e388c7382563b7497397c78bc078d0679dc891a8 2006-05-05T14:37:08-07:00 2006-05-02T00:40:24-07:00 core.prefersymlinkrefs: use symlinks for .git/HEAD When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 9f0bb90d161edf8c43f5261d12bf83f14eb02ff4 commit) d632fde11831ec54fd46275cf9d90118318c93b7 Junio C Hamano junkio@cox.net 93ddef3e2dd5f7f3238fad9d52e974d03c7844f2 Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/7ebdba614223f867d3f19963647406df1d0e5ce0 7ebdba614223f867d3f19963647406df1d0e5ce0 2006-05-05T14:34:47-07:00 2006-05-02T07:58:37-07:00 repo-config: trim white-space before comment Earlier, calling git-repo-config core.hello on a .git/config like this: [core] hello = world ; a comment would yield "world " (i.e. with a trailing space). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80 commit) f5701cd29cbc27db905187fce3e442909ef49150 Junio C Hamano junkio@cox.net 7abd7117ec57b8c3c2a469db62c7811fdac5c655 sean seanlkml@sympatico.ca http://github.com/rtyler/slide-git/commit/93ddef3e2dd5f7f3238fad9d52e974d03c7844f2 93ddef3e2dd5f7f3238fad9d52e974d03c7844f2 2006-05-05T14:33:58-07:00 2006-05-05T06:49:15-07:00 Fix for config file section parsing. Currently, if the target key has a section that matches the initial substring of another section we mistakenly believe we've found the correct section. To avoid this problem, ensure that the section lengths are identical before comparison. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> 7afb0223c5ca77620f9073c7246ba78362784a7b Junio C Hamano junkio@cox.net 9290cd58c374a73cca989879678dc1ee929cdf2e Jon Loeliger jdl@jdl.com http://github.com/rtyler/slide-git/commit/7abd7117ec57b8c3c2a469db62c7811fdac5c655 7abd7117ec57b8c3c2a469db62c7811fdac5c655 2006-05-03T22:59:30-07:00 2006-05-03T21:19:54-07:00 Add a few more words to the glossary. Clean up a few entries and fix typos. bare repository cherry-picking hook topic branch [jc: removing questionable "symbolic ref -- see 'ref'" for now.] Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 4fad41fe574b3ef6e2967e75850c48132bf4e1a0 Junio C Hamano junkio@cox.net aa9b1573a5ca93395e8e41651bfc7245f10e0240 Jon Loeliger jdl@jdl.com http://github.com/rtyler/slide-git/commit/9290cd58c374a73cca989879678dc1ee929cdf2e 9290cd58c374a73cca989879678dc1ee929cdf2e 2006-05-03T22:31:50-07:00 2006-05-03T21:18:59-07:00 Added definitions for a few words: fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 0ca92d84ab0ec6e96d45d9653f967b509d799d6b Junio C Hamano junkio@cox.net de5f2bf3612a43af074a98fd1fcdef6a403daf3f Jon Loeliger jdl@jdl.com http://github.com/rtyler/slide-git/commit/aa9b1573a5ca93395e8e41651bfc7245f10e0240 aa9b1573a5ca93395e8e41651bfc7245f10e0240 2006-05-03T22:31:43-07:00 2006-05-03T21:15:46-07:00 Alphabetize the glossary. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> f3151a0def9f23c7a84babc482a0f02d82c73bc2 Junio C Hamano junkio@cox.net e923effb43fa952f9cb72ffe4c3625fce7655bff Matthias Kestenholz matthias@spinlock.ch http://github.com/rtyler/slide-git/commit/de5f2bf3612a43af074a98fd1fcdef6a403daf3f de5f2bf3612a43af074a98fd1fcdef6a403daf3f 2006-05-03T14:08:41-07:00 2006-05-03T03:51:40-07:00 fix various typos in documentation Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net> 2560ea707a4e85cd140088a97721ba08178141d1 Junio C Hamano junkio@cox.net