74fbd1182a8300dd0a1d788120813b6d5b9e5cb6 6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/9bfff3ae5fdf1dcd0705056f7f9a42e81548797e 9bfff3ae5fdf1dcd0705056f7f9a42e81548797e 2009-12-31T15:00:14-08:00 2009-12-31T15:00:14-08:00 Merge branch 'maint-1.6.0' into maint * maint-1.6.0: branch: die explicitly why when calling "git branch [-a|-r] branchname". 509488d440f0f8a7228189ce94e66d5acce5757f Junio C Hamano gitster@pobox.com e97ca7f41f2b9bbdfc93d103c3f64337bb6dcc20 Matthieu Moy Matthieu.Moy@imag.fr http://github.com/git/git/commit/6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 2009-12-31T14:52:05-08:00 2009-12-30T06:45:31-08:00 branch: die explicitly why when calling "git branch [-a|-r] branchname". The -a and -r options used to be silently ignored in such a command. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 538b54ada8806479fd013931a10f1774f99499d7 Junio C Hamano gitster@pobox.com 63cb8215997fa7bef4319339060869a8c9cee8aa Shawn O. Pearce spearce@spearce.org http://github.com/git/git/commit/74fbd1182a8300dd0a1d788120813b6d5b9e5cb6 74fbd1182a8300dd0a1d788120813b6d5b9e5cb6 2009-12-31T14:46:08-08:00 2009-12-30T07:03:48-08:00 fast-import: Document author/committer/tagger name is optional The fast-import parser does not validate that the author, committer or tagger name component contains both a name and an email address. Therefore the name component has always been optional. Correct the documentation to match the implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9dfb98d148980f6522f3e35883cf51cb5a37bcc6 Junio C Hamano gitster@pobox.com b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 Matthieu Moy Matthieu.Moy@imag.fr http://github.com/git/git/commit/63cb8215997fa7bef4319339060869a8c9cee8aa 63cb8215997fa7bef4319339060869a8c9cee8aa 2009-12-31T14:46:08-08:00 2009-12-30T06:51:22-08:00 SubmittingPatches: hints to know the status of a submitted patch. "What happened to my patch" is pretty much a FAQ on the Git mailing list, it deserves a few paragraphs in SubmittingPatches... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 906ad7f1be52e1d895b68cbc00e882e241287a4c Junio C Hamano gitster@pobox.com f5e025a9d5b35e24768475f6890b836ce0d5ed15 70d7099916c9621e157c620f9cc7fc982f109c55 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 2009-12-30T01:24:12-08:00 2009-12-30T01:24:12-08:00 Merge branch 'maint-1.6.1' into maint * maint-1.6.1: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c diff.c f0631396a9ce6a1bdd3ef12f2c87cd47a7864cea Junio C Hamano gitster@pobox.com 799fdb4ed0f9443122fdb85f6f73c58cb1de12ec Jeff King peff@peff.net http://github.com/git/git/commit/70d7099916c9621e157c620f9cc7fc982f109c55 70d7099916c9621e157c620f9cc7fc982f109c55 2009-12-30T01:22:27-08:00 2009-12-30T01:02:53-08:00 textconv: stop leaking file descriptors We read the output from textconv helpers over a pipe, but we never actually closed our end of the pipe after using it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 1e3d34205b9fd9581535a563a49ba24cccc5fa24 Junio C Hamano gitster@pobox.com c985ddf318a8c41c6e1abc8bebd058b31c7413c1 e97ca7f41f2b9bbdfc93d103c3f64337bb6dcc20 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/799fdb4ed0f9443122fdb85f6f73c58cb1de12ec 799fdb4ed0f9443122fdb85f6f73c58cb1de12ec 2009-12-29T20:16:34-08:00 2009-12-29T20:16:34-08:00 Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: commit: --cleanup is a message option t7102: make the test fail if one of its check fails 451006d4be4d718d3cd33f0f947ebeea295b3481 Junio C Hamano gitster@pobox.com 153bb839aa0c36bf5c056a0b74b6d4d2fe99c157 Greg Price price@ksplice.com http://github.com/git/git/commit/e97ca7f41f2b9bbdfc93d103c3f64337bb6dcc20 e97ca7f41f2b9bbdfc93d103c3f64337bb6dcc20 2009-12-29T20:15:41-08:00 2009-12-29T13:54:49-08:00 commit: --cleanup is a message option In the usage message for "git commit", the --cleanup option appeared at the end, as one of the "contents options": usage: git commit [options] [--] <filepattern>... ... Commit message options ... Commit contents options ... --allow-empty ok to record an empty change --cleanup <default> how to strip spaces and #comments from message This is confusing, in part because it makes it ambiguous whether --allow-empty, just above, refers to an empty diff or an empty message. Move --cleanup into the 'message options' group. Also add a pair of comments to prevent similar oversights in the future. Signed-off-by: Greg Price <price@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2a4b98c76ff900beeb3d5ac65265a99e5abc9ec6 Junio C Hamano gitster@pobox.com 66fd74ea5db13e6f095f7c414e9ea4a1aa59cdc7 Andreas Schwab schwab@linux-m68k.org http://github.com/git/git/commit/c985ddf318a8c41c6e1abc8bebd058b31c7413c1 c985ddf318a8c41c6e1abc8bebd058b31c7413c1 2009-12-29T19:51:37-08:00 2009-12-29T11:09:15-08:00 git count-objects: handle packs bigger than 4G Use off_t to count sizes of packs and objects to avoid overflow after 4Gb. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> ed7352463f586831950d33a1220613762d450958 Junio C Hamano gitster@pobox.com 82d97da30aba767e5c8406b595274af299858357 Nguyễn Thái Ngọc Duy pclouds@gmail.com http://github.com/git/git/commit/153bb839aa0c36bf5c056a0b74b6d4d2fe99c157 153bb839aa0c36bf5c056a0b74b6d4d2fe99c157 2009-12-29T19:39:27-08:00 2009-12-29T00:13:18-08:00 t7102: make the test fail if one of its check fails Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 00eddca95522f4b4fec8c75c52f585c49821b2d3 Junio C Hamano gitster@pobox.com 0622f79d8e7e91efc5870afe0ce134e1cee9f9f0 Nguyễn Thái Ngọc Duy pclouds@gmail.com http://github.com/git/git/commit/f5e025a9d5b35e24768475f6890b836ce0d5ed15 f5e025a9d5b35e24768475f6890b836ce0d5ed15 2009-12-29T07:57:54-08:00 2009-12-28T23:48:41-08:00 Documentation: always respect core.worktree if set The value of core.worktree in a ".git/config" is honored even when it differs from the directory that has the ".git" directory as its subdirectory. This is likely to be a misconfiguration, so warn users about it. Also, drop the part of the documentation that incorrectly claimed that we ignore such a misconfigured value. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 070c2c0e0ff142e5997c7316539004de87ec8e96 Junio C Hamano gitster@pobox.com 21a0d9b42d9cc9560c66fb3cfa82a2a449de8b39 07cc8ecac0313c571cb9838585b376df86c80563 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/0622f79d8e7e91efc5870afe0ce134e1cee9f9f0 0622f79d8e7e91efc5870afe0ce134e1cee9f9f0 2009-12-27T10:42:00-08:00 2009-12-27T10:42:00-08:00 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maint * nf/maint-fix-index-ext-len-on-be64: read_index(): fix reading extension size on BE 64-bit archs 30926e9f77a1acd3fd0bd351eb0e432bc5e697fa Junio C Hamano gitster@pobox.com 7a51ed66f653c248993b3c4a61932e47933d835e Nathaniel W Filardo nwf@cs.jhu.edu http://github.com/git/git/commit/07cc8ecac0313c571cb9838585b376df86c80563 07cc8ecac0313c571cb9838585b376df86c80563 2009-12-27T10:41:48-08:00 2009-12-26T22:11:21-08:00 read_index(): fix reading extension size on BE 64-bit archs On big endian platforms with 8-byte unsigned long, the code reads the size of the index extension section (which is a 4-byte network byte order integer) incorrectly. Signed-off-by: Junio C Hamano <gitster@pobox.com> a76397a13d474ba21541ee11cfc3351887f77286 Junio C Hamano gitster@pobox.com 685c568a7ac73794bcc367fddae129c8fcaf1d2e Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/21a0d9b42d9cc9560c66fb3cfa82a2a449de8b39 21a0d9b42d9cc9560c66fb3cfa82a2a449de8b39 2009-12-26T14:32:36-08:00 2009-12-26T14:32:36-08:00 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV Signed-off-by: Junio C Hamano <gitster@pobox.com> bd1171c18e67cacdc452c9fc00d3ffd0d586de41 Junio C Hamano gitster@pobox.com d828fdb8d79b1d06b3015d9a45da24ac3f887484 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/685c568a7ac73794bcc367fddae129c8fcaf1d2e 685c568a7ac73794bcc367fddae129c8fcaf1d2e 2009-12-26T14:20:09-08:00 2009-12-26T14:20:09-08:00 Start 1.6.6.X maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> 709064254c096683e40cd69c79860ba622f43cc6 Junio C Hamano gitster@pobox.com 5717b47c59b0d01d9820dd6d4073d7428d9d4c6e eca4460eeb18b895cb6ca590490073f75fd010a6 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/d828fdb8d79b1d06b3015d9a45da24ac3f887484 d828fdb8d79b1d06b3015d9a45da24ac3f887484 2009-12-26T14:15:55-08:00 2009-12-26T14:15:55-08:00 Merge branch 'jc/maint-obsd46' into maint * jc/maint-obsd46: t4019 "grep" portability fix t1200: work around a bug in some implementations of "find" 929110458a6ea604f3fefafe432e067993959402 Junio C Hamano gitster@pobox.com 902f235378cb2b2f6dd5dd664b9630c95321f0ae Tarmigan Casebolt tarmigan+git@gmail.com http://github.com/git/git/commit/5717b47c59b0d01d9820dd6d4073d7428d9d4c6e 5717b47c59b0d01d9820dd6d4073d7428d9d4c6e 2009-12-26T14:12:34-08:00 2009-12-26T09:01:07-08:00 Add git-http-backend to command-list. Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2eba782e3b47f87345e10aed612875c2efde8790 Junio C Hamano gitster@pobox.com 15caa41053c465aeabb1a0d2d3d3c12d701bc62d Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/eca4460eeb18b895cb6ca590490073f75fd010a6 eca4460eeb18b895cb6ca590490073f75fd010a6 2009-12-26T13:59:34-08:00 2009-12-26T13:53:17-08:00 t4019 "grep" portability fix Input to "grep" is supposed to be "text", but we deliberately feed output from "git diff --color" to sift it into two sets of lines (ones with errors, the other without). Some implementations of "grep" only report matches with the exit status, without showing the matched lines in their output (e.g. OpenBSD 4.6, which says "Binary file .. matches"). Fortunately, "grep -a" is often a way to force the command to treat its input as text. Signed-off-by: Junio C Hamano <gitster@pobox.com> 355b127ca87f13e96d2e3355cbe66b17a889e989 Junio C Hamano gitster@pobox.com 902f235378cb2b2f6dd5dd664b9630c95321f0ae Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/15caa41053c465aeabb1a0d2d3d3c12d701bc62d 15caa41053c465aeabb1a0d2d3d3c12d701bc62d 2009-12-26T13:59:31-08:00 2009-12-26T13:53:45-08:00 t1200: work around a bug in some implementations of "find" "find path ..." command should exit with zero status only when all path operands were traversed successfully. When a non-existent path is given, however, some implementations of "find" (e.g. OpenBSD 4.6) exit with zero status and break the last test in t1200. Rewrite the test to check that there is no regular files in the objects fan-out directories to work around this bug; it is closer to what we are testing anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> 5d09c52cdf751eff786ba3f77bc5b4ef2d0eb759 Junio C Hamano gitster@pobox.com b7f44fdf27c1f5dfee099c504a55b62674e7567b Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/902f235378cb2b2f6dd5dd664b9630c95321f0ae 902f235378cb2b2f6dd5dd664b9630c95321f0ae 2009-12-23T12:23:11-08:00 2009-12-23T11:58:52-08:00 Git 1.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17373b26303377abfca4417bc8aef28b6fc812dd Junio C Hamano gitster@pobox.com 150d38c4f3733b38c2c212469afa162a55e0e99d Robert Zeh robert.a.zeh@gmail.com http://github.com/git/git/commit/b7f44fdf27c1f5dfee099c504a55b62674e7567b b7f44fdf27c1f5dfee099c504a55b62674e7567b 2009-12-23T11:58:05-08:00 2009-12-23T09:54:11-08:00 git svn: add test for a git svn gc followed by a git svn mkdirs git svn gc will compress the unhandled.log files that git svn mkdirs reads, causing git svn mkdirs to skip directory creation. [ew: trivial whitespace cleanups] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Robert Zeh <robert.a.zeh@gmail.com> 2af7ea2c78f2a4a3fa46a702e5f63c90c4618171 Eric Wong normalperson@yhbt.net 129a5a6deacfe6ffb32291fcd96e0d1567f780b2 Eric Wong normalperson@yhbt.net http://github.com/git/git/commit/150d38c4f3733b38c2c212469afa162a55e0e99d 150d38c4f3733b38c2c212469afa162a55e0e99d 2009-12-23T11:58:05-08:00 2009-12-22T22:40:18-08:00 git svn: branch/tag commands detect username in URLs svn+ssh:// repositories often have userinfo embedded in the URL which were stripped out of the "git-svn-id:" trailers. Since the SVN::Client::copy function takes userinfo into account when matching URLs for SVN repositories, we need to retrieve the full URL with embedded userinfo in it to avoid mismatched URLs. Tested-by: Florian Köberle <florian@fkoeberle.de> Signed-off-by: Eric Wong <normalperson@yhbt.net> 010d784cdf08c9d3b35cb8e62e66f842b35ea4c3 Eric Wong normalperson@yhbt.net 0fe19753f26e2747f48d1ec6a1761006d75c2d71 c8cba79181abc139d7cba364bf868875426fc2c1 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/129a5a6deacfe6ffb32291fcd96e0d1567f780b2 129a5a6deacfe6ffb32291fcd96e0d1567f780b2 2009-12-22T12:32:39-08:00 2009-12-22T12:32:39-08:00 Merge branch 'maint' * maint: Prevent git blame from segfaulting on a missing author name dd00f5a0afb3ef544a530109f5c66311cffe93e9 Junio C Hamano gitster@pobox.com 063681d72e60e80cd14576037728b395ed42e330 Eric Wong normalperson@yhbt.net http://github.com/git/git/commit/0fe19753f26e2747f48d1ec6a1761006d75c2d71 0fe19753f26e2747f48d1ec6a1761006d75c2d71 2009-12-22T12:15:40-08:00 2009-12-22T12:15:40-08:00 git svn: lookup new parents correctly from svn:mergeinfo This appears to be a trivial case where array indices were being passed to git rev-list, instead of the contents stored in the array itself. Signed-off-by: Eric Wong <normalperson@yhbt.net> 6386cdd8ddd4aff52e65032a48c23d479e9b322b Eric Wong normalperson@yhbt.net e49ca974d6ff2dda1ff4ee39e7cc33af33d1eb2a David Reiss dreiss@facebook.com http://github.com/git/git/commit/c8cba79181abc139d7cba364bf868875426fc2c1 c8cba79181abc139d7cba364bf868875426fc2c1 2009-12-22T11:51:17-08:00 2009-12-22T10:51:41-08:00 Prevent git blame from segfaulting on a missing author name The human-readable author and committer name can be missing from commits imported from foreign SCM interfaces. Make sure we parse the "author" and "committer" line a bit more leniently and avoid segfaulting by assuming the name always exists. Signed-off-by: David Reiss <dreiss@facebook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> fbe48748ccb1778d9173bf2816ef8a0812e222b2 Junio C Hamano gitster@pobox.com 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee Andrew Myrick amyrick@apple.com http://github.com/git/git/commit/063681d72e60e80cd14576037728b395ed42e330 063681d72e60e80cd14576037728b395ed42e330 2009-12-21T14:33:50-08:00 2009-12-21T14:22:54-08:00 git-svn: Remove obsolete MAXPARENT check Change git-svn not to impose a limit of 16 parents on a merge. This limit in git-svn artificially prevents cloning svn repositories that contain commits with more than 16 merge parents. The limit was removed from builtin-commit-tree.c for git v1.6.0 in commit ef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it it in git-svn. Signed-off-by: Andrew Myrick <amyrick@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> 4b58f35c371d64a9c24e3fba2ed565b0b34f76a4 Eric Wong normalperson@yhbt.net ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 Sam Vilain sam@vilain.net http://github.com/git/git/commit/7a955a5365d9ebd5e12c12ed926b2b51b61c02ee 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee 2009-12-21T02:32:53-08:00 2009-12-19T08:26:26-08:00 git-svn: detect cherry-picks correctly. The old function was incorrect; in some instances it marks a cherry picked range as a merged branch (because of an incorrect assumption that 'rev-list COMMIT --not RANGE' would work). This is replaced with a function which should detect them correctly, memoized to limit the expense of dealing with branches with many cherry picks to one 'merge-base' call per merge, per branch which used cherry picking. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> f9fab812076328fab4546339b54e32bb88da87e6 Eric Wong normalperson@yhbt.net 33973a5b179278c563624fcb45c223f03031b242 Sam Vilain sam@vilain.net http://github.com/git/git/commit/ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 2009-12-21T02:32:52-08:00 2009-12-19T08:25:31-08:00 git-svn: exclude already merged tips using one rev-list call The old function would have to check all mentioned merge tips, every time that the mergeinfo ticket changed. This involved 1-2 rev-list operation for each listed mergeinfo line. If there are a lot of feature branches being merged into a trunk, this makes for a very expensive operation for detecting the new parents on every merge. This new version first uses a single 'rev-list' to figure out which commit ranges are already reachable from the parents. This is used to eliminate the already merged branches from the list. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> 43ace88e0ce5ed8e259de4aed1022787640e50e5 Eric Wong normalperson@yhbt.net 7d944c3399c4145293d599e1ddc76d1ac0c1e118 Sam Vilain sam@vilain.net http://github.com/git/git/commit/33973a5b179278c563624fcb45c223f03031b242 33973a5b179278c563624fcb45c223f03031b242 2009-12-21T02:32:50-08:00 2009-12-19T08:22:42-08:00 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges SVN's list of commit ranges in mergeinfo tickets is inclusive, whereas git commit ranges are exclusive on the left hand side. Also, the end points of the commit ranges may not exist; they simply delineate ranges of commits which may or may not exist. Fix these two mistakes. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> 5359e45455d6b0a943c22114e85facaba9792999 Eric Wong normalperson@yhbt.net 1d144aa25edbb4dcda88abbaef8f336108b8d788 Sam Vilain sam@vilain.net http://github.com/git/git/commit/7d944c3399c4145293d599e1ddc76d1ac0c1e118 7d944c3399c4145293d599e1ddc76d1ac0c1e118 2009-12-21T02:32:48-08:00 2009-12-19T03:55:13-08:00 git-svn: memoize conversion of SVN merge ticket info to git commit ranges Each time the svn mergeinfo ticket changes, we look it up in the rev_map; when there are a lot of merged branches, this will result in many repeated lookups of the same information for subsequent commits. Arrange the slow part of the function so that it may be memoized, and memoize it. The more expensive revision walking operation can be memoized separately. [ew: changed "next" to "return" for function exit] Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> 4850db3279150a4225b6d93c423c3f726aedee7d Eric Wong normalperson@yhbt.net