f178c8743bf8a3f5ddcbf10d37523f502fc43673 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/1d3117f8cbb6b4b2c87b4b238f54444339bede64 1d3117f8cbb6b4b2c87b4b238f54444339bede64 2009-04-27T04:54:42-07:00 2009-04-27T04:54:42-07:00 Incorporating outstanding changes from the upstream master branch Signed-off-by: R. Tyler Ballance <tyler@slide.com> c33337a3f25057f561dd7cd3758121ae78642c9a R. Tyler Ballance tyler@slide.com 9434ec85ab6c7f72d46f84061fb5c98331026203 4588ab28200a98883576643ff9136cbeef8e2e6d R. Tyler Ballance tyler@starfruit.local http://github.com/rtyler/slide-git/commit/f178c8743bf8a3f5ddcbf10d37523f502fc43673 f178c8743bf8a3f5ddcbf10d37523f502fc43673 2009-04-02T23:25:33-07:00 2009-04-02T23:25:33-07:00 Merge branch 'master' into slide_master Majority of the conflicts were due to this commit: 39c68542fc8d8477f2080c99efedb9dce975abc6 Which conflicted with a patch applied out-of-mainstream from spearce@ to fix the same zlib memory issue Conflicts: GIT-VERSION-GEN builtin-apply.c builtin-pack-objects.c builtin-unpack-objects.c http-push.c http-walker.c index-pack.c sha1_file.c wrapper.c Signed-off-by: R. Tyler Ballance <tyler@starfruit.local> f05c31cbb9d3d36e40626998a82ca3d4853d4e77 R. Tyler Ballance tyler@starfruit.local 4a7836491cc229e931cb499319a29e1f88b79dc5 e96f3689ecd95997a2a474c2b7f21b0a67f138b1 R. Tyler Ballance tyler@starfruit.local http://github.com/rtyler/slide-git/commit/4588ab28200a98883576643ff9136cbeef8e2e6d 4588ab28200a98883576643ff9136cbeef8e2e6d 2009-04-02T23:08:26-07:00 2009-04-02T23:08:26-07:00 Merge branch 'master' of git://git.kernel.org/pub/scm/git/git 8bedfec20888f063b6cb9675524462a1448660fe R. Tyler Ballance tyler@starfruit.local 8130949bdc9c36f527148205b86a2ffe551cac53 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/e96f3689ecd95997a2a474c2b7f21b0a67f138b1 e96f3689ecd95997a2a474c2b7f21b0a67f138b1 2009-04-02T13:42:24-07:00 2009-04-02T13:42:24-07:00 Update draft release notes to 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 76928c8b7101562b0c88856340ab768e762904ba Junio C Hamano gitster@pobox.com a61c0ffa4474ad6dcec18a5454630371106710f4 3346330d708b9b786b16167cbbd4a3637b3a3517 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/8130949bdc9c36f527148205b86a2ffe551cac53 8130949bdc9c36f527148205b86a2ffe551cac53 2009-04-02T12:35:48-07:00 2009-04-02T12:35:48-07:00 Sync with 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 88af59b00c14fef0f31731c2cf9d2057218203c2 Junio C Hamano gitster@pobox.com 5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/3346330d708b9b786b16167cbbd4a3637b3a3517 3346330d708b9b786b16167cbbd4a3637b3a3517 2009-04-02T12:34:16-07:00 2009-04-02T12:21:57-07:00 GIT 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 1cd1fe613e270f5a8a44e2879307440d7d47ecc1 Junio C Hamano gitster@pobox.com cb365a7a564152662e3f9c5b9a92e37aaf726ed9 aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005 5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005 2009-04-02T12:14:37-07:00 2009-04-02T12:14:37-07:00 Merge branch 'jc/maint-1.6.0-blame-s' into maint * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c 1888b316163a5c96efc874a3d8f40b219a2af0e0 Junio C Hamano gitster@pobox.com 1e7ef0253c91bf2f25f9d8e44795b642737e664e 4e218f54b3de6aa8ef7d15020c4507031a519f7d Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/cb365a7a564152662e3f9c5b9a92e37aaf726ed9 cb365a7a564152662e3f9c5b9a92e37aaf726ed9 2009-04-02T12:02:30-07:00 2009-04-02T12:02:30-07:00 Merge branch 'js/maint-diff-temp-smudge' into maint * js/maint-diff-temp-smudge: Smudge the files fed to external diff and textconv 98c9c3721fa7f5984c4109cb2dcb1b56ae053b17 Junio C Hamano gitster@pobox.com 8afd3178437eef29a08ba21aceb47a94177409d5 c90d565a46a664663467557d381417a3153fe26e Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/1e7ef0253c91bf2f25f9d8e44795b642737e664e 1e7ef0253c91bf2f25f9d8e44795b642737e664e 2009-04-02T12:02:25-07:00 2009-04-02T12:02:25-07:00 Merge branch 'js/maint-1.6.0-exec-path-env' into maint * js/maint-1.6.0-exec-path-env: Propagate --exec-path setting to external commands via GIT_EXEC_PATH 09e0414afd4cadedcd48d0648650ef7d351572f3 Junio C Hamano gitster@pobox.com b5a18787bd5c757b49a7ea4fdd73e62a1fee35de 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/8afd3178437eef29a08ba21aceb47a94177409d5 8afd3178437eef29a08ba21aceb47a94177409d5 2009-04-02T12:02:18-07:00 2009-04-02T12:02:18-07:00 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint * bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" Conflicts: builtin-branch.c 533fedcb0e579f28157dd12340fe9f962b506921 Junio C Hamano gitster@pobox.com 66c9e7d48769e5a805cf5db0ca8dba30a86b8069 2d266f9d623625e0a28fbe3c3615707500e9448f Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/b5a18787bd5c757b49a7ea4fdd73e62a1fee35de b5a18787bd5c757b49a7ea4fdd73e62a1fee35de 2009-04-02T12:00:59-07:00 2009-04-02T12:00:59-07:00 Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications 3b436cef9f8ffa014aff4f9a051ccc43241ff6da Junio C Hamano gitster@pobox.com 763481787174adfcc247d6044bea330edcb2cc24 19fa5e8c4d62d445b822e0d0d87a4f995e6c863f Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/66c9e7d48769e5a805cf5db0ca8dba30a86b8069 66c9e7d48769e5a805cf5db0ca8dba30a86b8069 2009-04-02T11:58:39-07:00 2009-04-02T11:58:39-07:00 Merge branch 'dm/maint-docco' into maint * dm/maint-docco: Documentation: Remove spurious uses of "you" in git-bisect.txt. Documentation: minor grammatical fix in git-check-ref-format.txt Documentation: minor grammatical fixes in git-check-attr.txt Documentation: minor grammatical fixes in git-cat-file.txt Documentation: minor grammatical fixes and rewording in git-bundle.txt Documentation: remove some uses of the passive voice in git-bisect.txt Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt. 46fb0cbec901fa54a9454c77a507985c2ff52200 Junio C Hamano gitster@pobox.com 3b3637c3f1d752e6e6d559f30cc53bbec18537ef Jay Soffian jaysoffian@gmail.com http://github.com/rtyler/slide-git/commit/a61c0ffa4474ad6dcec18a5454630371106710f4 a61c0ffa4474ad6dcec18a5454630371106710f4 2009-04-02T10:46:21-07:00 2009-03-31T09:22:14-07:00 send-email: ensure quoted addresses are rfc2047 encoded sanitize_address assumes that quoted addresses (e.g., "first last" <first.last@example.com) do not need rfc2047 encoding, but this is not always the case. For example, various places in send-email extract addresses using parse_address_line. parse_address_line returns the addresses already quoted (e.g., "first last" <first.last@example.com), but not rfc2047 encoded. This patch makes sanitize_address stricter about what needs rfc2047 encoding and adds a test demonstrating where I noticed the problem. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13050336905d92f95adaaff77bc7629c8d053d7a Junio C Hamano gitster@pobox.com dffc13166ba8950b2ddbac2406042751f96841b7 Jay Soffian jaysoffian@gmail.com http://github.com/rtyler/slide-git/commit/3b3637c3f1d752e6e6d559f30cc53bbec18537ef 3b3637c3f1d752e6e6d559f30cc53bbec18537ef 2009-04-02T10:46:21-07:00 2009-03-31T09:22:13-07:00 send-email: correct two tests which were going interactive Commit c18f75a (send-email: add tests for refactored prompting, 2009-03-28) added two tests which went interactive under the dash shell. This patch corrects the issue, reported by Björn Steinbrink. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 7cfdde78e308476de6f8f4da0a16467c664db9ab Junio C Hamano gitster@pobox.com 37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29 1982467d9229e3c92157f2a41363365dcb866e86 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/dffc13166ba8950b2ddbac2406042751f96841b7 dffc13166ba8950b2ddbac2406042751f96841b7 2009-04-01T22:49:28-07:00 2009-04-01T22:49:28-07:00 Merge branch 'ef/fast-export' * ef/fast-export: builtin-fast-export.c: handle nested tags builtin-fast-export.c: fix crash on tagged trees builtin-fast-export.c: turn error into warning test-suite: adding a test for fast-export with tag variants 66af1ab857dcce7d829f377f17bb54317eeb118c Junio C Hamano gitster@pobox.com 85b7bd50c47e0f5236cdb93d1be3163a8a1a3be6 d7d9c2d04962b5aec34ec891d82dd74262306c56 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29 37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29 2009-04-01T22:49:24-07:00 2009-04-01T22:49:24-07:00 Merge branch 'mh/format-patch-add-header' * mh/format-patch-add-header: format-patch: add arbitrary email headers c7496f349137603a8ef89cb72b9049107b84e04a Junio C Hamano gitster@pobox.com 02c62b10de16515497f1b6fde6278ac531b90f1c 2d266f9d623625e0a28fbe3c3615707500e9448f Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/85b7bd50c47e0f5236cdb93d1be3163a8a1a3be6 85b7bd50c47e0f5236cdb93d1be3163a8a1a3be6 2009-04-01T22:49:03-07:00 2009-04-01T22:49:03-07:00 Merge branch 'tr/maint-1.6.1-doc-format-patch--root' * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications 7b565c28cc3d8d1137e9dd297f638e6fffdc7625 Junio C Hamano gitster@pobox.com 477fde6ff3262a132f03376f86c9727c0f411723 763481787174adfcc247d6044bea330edcb2cc24 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/02c62b10de16515497f1b6fde6278ac531b90f1c 02c62b10de16515497f1b6fde6278ac531b90f1c 2009-04-01T22:46:31-07:00 2009-04-01T22:46:31-07:00 Merge branch 'maint' * maint: Documentation: Remove an odd "instead" fix portability problem with IS_RUN_COMMAND_ERR mailmap: resurrect lower-casing of email addresses 7c449c4212d6b05ed7e933cfb46f7a86e4cbe0de Junio C Hamano gitster@pobox.com fd94836923708581ca3f9b5c42a6d600c2f631dc f054a419419337142ffe40433aa3984ccc000624 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/763481787174adfcc247d6044bea330edcb2cc24 763481787174adfcc247d6044bea330edcb2cc24 2009-04-01T22:36:05-07:00 2009-04-01T22:36:05-07:00 Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Documentation: Remove an odd "instead" 3acada7b9eb628e8ecb3df8a97edaa61aaf485e1 Junio C Hamano gitster@pobox.com dcbf0417453297207c7e61efbf1f38621b1caa3f 5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/f054a419419337142ffe40433aa3984ccc000624 f054a419419337142ffe40433aa3984ccc000624 2009-04-01T22:35:57-07:00 2009-04-01T22:35:57-07:00 Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: Remove an odd "instead" 0d383a217519081fe7243c9f371f5756690afef1 Junio C Hamano gitster@pobox.com 3c91bf6805249d0f59ddff4e5dc4118127527243 2346431e476ab9f095f0dd2921f63fa071039bb8 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/477fde6ff3262a132f03376f86c9727c0f411723 477fde6ff3262a132f03376f86c9727c0f411723 2009-04-01T22:35:00-07:00 2009-04-01T22:35:00-07:00 Merge branch 'cj/doc-format' * cj/doc-format: Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set Documentation: option to render literal text as bold for manpages Documentation: asciidoc.conf: fix verse block with block titles Documentation: asciidoc.conf: always use <literallayout> for [blocktext] Documentation: move "spurious .sp" code into manpage-base.xsl Documentation: move quieting params into manpage-base.xsl Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl Documentation: move callouts.xsl to manpage-{base,normal}.xsl Documentation/Makefile: break up texi pipeline Documentation/Makefile: make most operations "quiet" eda5f1d00b7ba9d56c06605fff5630684139da4b Junio C Hamano gitster@pobox.com 988d9fd8a42b388c30625378dcb521a3b2021b72 094085e3362c592c932b41525ed37152ec171192 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/3c91bf6805249d0f59ddff4e5dc4118127527243 3c91bf6805249d0f59ddff4e5dc4118127527243 2009-04-01T22:34:19-07:00 2009-04-01T22:34:19-07:00 Merge branch 'jc/maint-1.6.0-keep-pack' * jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws Conflicts: t/t7700-repack.sh 8f07aa193c5206f736c1dbe2e3ac688938704636 Junio C Hamano gitster@pobox.com 0e5e69a355b7bdd1af6ca33ac7ee35299bda368e 19de5d6913b9681d2bde533bccc8445c9236a648 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/988d9fd8a42b388c30625378dcb521a3b2021b72 988d9fd8a42b388c30625378dcb521a3b2021b72 2009-04-01T22:27:43-07:00 2009-04-01T22:27:43-07:00 Merge branch 'kb/tracking-count-no-merges' * kb/tracking-count-no-merges: stat_tracking_info(): only count real commits 87463803e0bbfe409c4a0735579fa3b00cce991b Junio C Hamano gitster@pobox.com 5288dd58356e53d61e2b3804fc7d8d23c3a46ab3 Wesley J. Landaker wjl@icecavern.net http://github.com/rtyler/slide-git/commit/0e5e69a355b7bdd1af6ca33ac7ee35299bda368e 0e5e69a355b7bdd1af6ca33ac7ee35299bda368e 2009-04-01T21:43:03-07:00 2009-04-01T15:05:01-07:00 Documentation: git-svn: fix trunk/fetch svn-remote key typo Fix the git-svn documentation svn-remote example section talking about tags and branches by using the proper key "fetch" instead of "trunk". Using "trunk" actually might be nice, but it doesn't currently work. The fetch line for the trunk was also reordered to be at the top of the list, since most people think about the trunk/tags/branches trio in that logical order. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8c2e0990dccc304883f08b2b40aaa19d901f828c Junio C Hamano gitster@pobox.com 75fd877e150ecca74f9749bfd6bfa9a6b425ab57 Björn Steinbrink B.Steinbrink@gmx.de http://github.com/rtyler/slide-git/commit/5288dd58356e53d61e2b3804fc7d8d23c3a46ab3 5288dd58356e53d61e2b3804fc7d8d23c3a46ab3 2009-04-01T15:53:36-07:00 2009-03-31T08:30:39-07:00 Mailmap: Allow empty email addresses to be mapped While it makes no sense to map some email address to an empty one, doing things the other way around can be useful. For example when using filter-branch with an env-filter that employs a mailmap to fix up an import that created such broken commits with empty email addresses. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8442c682ec805f3f1df62404472ae3d887e3b7be Junio C Hamano gitster@pobox.com dc1460aa8de64f62b4612b6d2546ed7b88050de2 Heiko Voigt hvoigt@hvoigt.net http://github.com/rtyler/slide-git/commit/75fd877e150ecca74f9749bfd6bfa9a6b425ab57 75fd877e150ecca74f9749bfd6bfa9a6b425ab57 2009-04-01T15:46:46-07:00 2009-04-01T13:24:28-07:00 Cleanup warning about known issues in cvsimport documentation Not all statements were complete sentences. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26c3edafb8febfe429ce7d462bac2e6c8401ab1f Junio C Hamano gitster@pobox.com ba7906f2f4c332f814d270d2e16b0010516fc53e Holger Weiß holger@zedat.fu-berlin.de http://github.com/rtyler/slide-git/commit/5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 2009-04-01T11:34:02-07:00 2009-03-31T09:57:01-07:00 Documentation: Remove an odd "instead" Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23f82a4fa6643554cf9237c6ae5cec12bd70abbc Junio C Hamano gitster@pobox.com 5906f54e474c6e8aabb0f6b955d446b509cde06e Jay Soffian jaysoffian@gmail.com http://github.com/rtyler/slide-git/commit/dc1460aa8de64f62b4612b6d2546ed7b88050de2 dc1460aa8de64f62b4612b6d2546ed7b88050de2 2009-04-01T11:11:21-07:00 2009-03-31T09:22:12-07:00 send-email: ask_default should apply to all emails, not just the first Commit 6e18251 made the "Send this email?" prompt assume yes if confirm = "inform" when it was unable to get a valid response. However, the "yes" assumption only worked correctly for the first email. This commit fixes the issue and confirms the fix by modifying the existing test for the prompt to send multiple emails. Reported by Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> ad4c752bb4a7e4b04de2bf78235043a1e99c454e Junio C Hamano gitster@pobox.com 91286ca61af404d53d946d6c3388b24f004433d2 Jay Soffian jaysoffian@gmail.com http://github.com/rtyler/slide-git/commit/5906f54e474c6e8aabb0f6b955d446b509cde06e 5906f54e474c6e8aabb0f6b955d446b509cde06e 2009-04-01T11:10:06-07:00 2009-03-31T09:22:11-07:00 send-email: don't attempt to prompt if tty is closed Attempting to prompt when the tty is closed (typically when running from cron) is pointless and emits a warning. This patch causes ask() to return early, squelching the warning. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> cf5a423e7fef09ae718a21140943d736849eb8de Junio C Hamano gitster@pobox.com bf637803a799451e7feb596422932dd60f0384e1 Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/fd94836923708581ca3f9b5c42a6d600c2f631dc fd94836923708581ca3f9b5c42a6d600c2f631dc 2009-04-01T11:05:54-07:00 2009-03-31T05:29:23-07:00 fix portability problem with IS_RUN_COMMAND_ERR Some old versions of gcc don't seem to like us negating an enum constant. Let's work around it by negating the other half of the comparison instead. Reported by Pierre Poissinger on gcc 2.9. Signed-off-by: Junio C Hamano <gitster@pobox.com> 7936c21440f1e4da339e5a708bc9dae7a95e1bf2 Junio C Hamano gitster@pobox.com