| a46221e | Junio C Hamano | 12 April 2013, 20:41:48 UTC | Merge branch 'rr/test-3200-style' into maint * rr/test-3200-style: t3200 (branch): modernize style Conflicts: t/t3200-branch.sh | 12 April 2013, 20:41:48 UTC |
| 97ff97d | Junio C Hamano | 12 April 2013, 20:41:48 UTC | Merge branch 'mg/texinfo-5' into maint * mg/texinfo-5: Documentation: Strip texinfo anchors to avoid duplicates | 12 April 2013, 20:41:48 UTC |
| 15af30e | Junio C Hamano | 12 April 2013, 20:41:47 UTC | Merge branch 'jk/diffcore-break-divzero' into maint * jk/diffcore-break-divzero: diffcore-break: don't divide by zero | 12 April 2013, 20:41:47 UTC |
| 788e98f | Junio C Hamano | 12 April 2013, 20:41:47 UTC | Merge branch 'cn/commit-amend-doc' into maint * cn/commit-amend-doc: Documentation/git-commit: reword the --amend explanation | 12 April 2013, 20:41:47 UTC |
| 23589a9 | Junio C Hamano | 12 April 2013, 20:41:46 UTC | Merge branch 'jk/bisect-prn-unsigned' into maint * jk/bisect-prn-unsigned: bisect: avoid signed integer overflow | 12 April 2013, 20:41:46 UTC |
| cd12104 | Junio C Hamano | 12 April 2013, 20:41:46 UTC | Merge branch 'jk/no-more-self-assignment' into maint * jk/no-more-self-assignment: match-trees: simplify score_trees() using tree_entry() submodule: clarify logic in show_submodule_summary | 12 April 2013, 20:41:46 UTC |
| b5581e6 | Junio C Hamano | 12 April 2013, 20:41:46 UTC | Merge branch 'rr/send-email-perl-critique' into maint * rr/send-email-perl-critique: send-email: use the three-arg form of open in recipients_cmd send-email: drop misleading function prototype send-email: use "return;" not "return undef;" on error codepaths | 12 April 2013, 20:41:46 UTC |
| 6a29370 | Junio C Hamano | 12 April 2013, 20:41:45 UTC | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint * jc/t5516-pushInsteadOf-vs-pushURL: t5516: test interaction between pushURL and pushInsteadOf correctly | 12 April 2013, 20:41:45 UTC |
| 41ccfdd | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | Correct common spelling mistakes in comments and tests Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 20:38:40 UTC |
| 2fec81c | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | kwset: fix spelling in comments Correct spelling mistakes noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:25:08 UTC |
| 0f7b4c2 | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | precompose-utf8: fix spelling of "want" in error message Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:24:04 UTC |
| 4283b8e | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | compat/nedmalloc: fix spelling in comments Correct some typos found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:23:58 UTC |
| ce9171c | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | compat/regex: fix spelling and grammar in comments Some of these were found using Lucas De Marchi's codespell tool. Others noticed by Eric Sunshine. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:23:44 UTC |
| 7323513 | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | obstack: fix spelling of similar Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:23:20 UTC |
| d0008b3 | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | contrib/subtree: fix spelling of accidentally Noticed with Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:23:12 UTC |
| 2582ab1 | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | git-remote-mediawiki: spelling fixes Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:13:05 UTC |
| e1c3bf4 | Stefano Lattarini | 11 April 2013, 22:36:10 UTC | doc: various spelling fixes Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 19:00:52 UTC |
| 7f20008 | Junio C Hamano | 12 April 2013, 18:48:38 UTC | Merge branch 'maint-1.8.1' into maint * maint-1.8.1: fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format | 12 April 2013, 18:48:38 UTC |
| 04a74b6 | Paul Price | 12 April 2013, 14:05:55 UTC | fast-export: fix argument name in error messages The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument. Signed-off-by: Paul Price <price@astro.princeton.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 16:48:46 UTC |
| 06cb843 | Stefan Saasen | 12 April 2013, 05:56:24 UTC | Documentation: distinguish between ref and offset deltas in pack-format eb32d236 introduced the OBJ_OFS_DELTA object that uses a relative offset to identify the base object instead of the 20-byte SHA1 reference. The pack file documentation only mentions the SHA1 based reference in its description of the deltified object entry. Update the pack format documentation to clarify that the deltified object representation refers to its base using either a relative negative offset or the absolute SHA1 identifier. Signed-off-by: Stefan Saasen <ssaasen@atlassian.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 16:14:01 UTC |
| 5234b41 | Junio C Hamano | 12 April 2013, 15:12:47 UTC | Merge branch 'tb/document-status-u-tradeoff' into maint * tb/document-status-u-tradeoff: i18n: make the translation of -u advice in one go | 12 April 2013, 15:12:47 UTC |
| 6290117 | Jiang Xin | 12 April 2013, 03:53:01 UTC | i18n: make the translation of -u advice in one go The advice (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 15:11:20 UTC |
| 3a51467 | Benoit Bourbie | 13 April 2013, 16:47:21 UTC | Typo fix: replacing it's -> its Signed-off-by: Benoit Bourbie <benoit.bourbie@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 00:39:05 UTC |
| 2007327 | Adam Spiers | 11 April 2013, 02:07:04 UTC | t: make PIPE a standard test prerequisite The 'PIPE' test prerequisite was already defined identically by t9010 and t9300, therefore it makes sense to make it a predefined prerequisite. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 00:39:05 UTC |
| 59a7714 | René Scharfe | 10 April 2013, 17:49:57 UTC | archive: clarify explanation of --worktree-attributes Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PWD). Link to the ATTRIBUTES section, which has more details. Reported-by: Amit Bakshi <ambakshi@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2013, 00:38:45 UTC |
| 13cb3bb | Simon Ruderich | 09 April 2013, 21:48:36 UTC | t/README: --immediate skips cleanup commands for failed tests Signed-off-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2013, 22:12:28 UTC |
| 5bda18c | Junio C Hamano | 07 April 2013, 22:27:23 UTC | Git 1.8.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2013, 22:27:23 UTC |
| 6466fbb | Junio C Hamano | 07 April 2013, 16:10:11 UTC | Sync with 1.8.1.6 | 07 April 2013, 20:17:50 UTC |
| 2137ce0 | Junio C Hamano | 07 April 2013, 15:58:30 UTC | Git 1.8.1.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2013, 15:58:30 UTC |
| 4bbb830 | Junio C Hamano | 07 April 2013, 15:45:03 UTC | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 A pattern "dir" (without trailing slash) in the attributes file stopped matching a directory "dir" by mistake with an earlier change that wanted to allow pattern "dir/" to also match. * jc/directory-attrs-regression-fix: t: check that a pattern without trailing slash matches a directory dir.c::match_pathname(): pay attention to the length of string parameters dir.c::match_pathname(): adjust patternlen when shifting pattern dir.c::match_basename(): pay attention to the length of string parameters attr.c::path_matches(): special case paths that end with a slash attr.c::path_matches(): the basename is part of the pathname | 07 April 2013, 15:45:03 UTC |
| 0e9b327 | Torsten Bögershausen | 07 April 2013, 08:48:30 UTC | remote-helpers/test-bzr.sh: do not use "grep '\s'" Using grep "devel\s\+3:" to find at least one whitspace is not portable on all grep versions; not all grep versions understand "\s" as a "whitespace". Use a literal TAB followed by SPACE. The + as a qualifier for "one or more" is not a basic regular expression; use egrep instead of grep. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2013, 15:41:34 UTC |
| aa7b8c6 | Carlos Martín Nieto | 03 April 2013, 13:07:21 UTC | Documentation/git-commit: reword the --amend explanation The explanation for 'git commit --amend' talks about preparing a tree object, which shouldn't be how user-facing documentation talks about commit. Reword it to say it works as usual, but replaces the current commit. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2013, 14:40:39 UTC |
| 3a3101c | Junio C Hamano | 04 April 2013, 20:03:34 UTC | mailmap: update Pasky's address Eric Wong noticed that the address at suse.cz no longer works. We may want to update in-code addresses as well, but let's do this first in 'maint'. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2013, 20:03:34 UTC |
| f4df84d | Junio C Hamano | 04 April 2013, 20:00:41 UTC | Merge branch 'nd/index-pack-threaded-fixes' into maint * nd/index-pack-threaded-fixes: index-pack: guard nr_resolved_deltas reads by lock index-pack: protect deepest_delta in multithread code | 04 April 2013, 20:00:41 UTC |
| 68447f0 | Junio C Hamano | 04 April 2013, 20:00:37 UTC | Merge branch 'jk/index-pack-correct-depth-fix' into maint * jk/index-pack-correct-depth-fix: index-pack: always zero-initialize object_entry list | 04 April 2013, 20:00:37 UTC |
| 8ce0ab4 | Junio C Hamano | 04 April 2013, 20:00:35 UTC | Merge branch 'rs/submodule-summary-limit' into maint "submodule summary --summary-limit" option did not support "--option=value" form. * rs/submodule-summary-limit: submodule summary: support --summary-limit=<n> | 04 April 2013, 20:00:35 UTC |
| 5ccb7e2 | Junio C Hamano | 04 April 2013, 19:59:55 UTC | Merge branch 'jk/peel-ref' into maint * jk/peel-ref: upload-pack: load non-tip "want" objects from disk upload-pack: make sure "want" objects are parsed upload-pack: drop lookup-before-parse optimization | 04 April 2013, 19:59:55 UTC |
| 9b924ee | Matthieu Moy | 04 April 2013, 07:56:03 UTC | git-remote-mediawiki: new wiki URL in documentation The Bibzball wiki is not maintained anymore. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2013, 16:54:38 UTC |
| cbfd124 | Martin von Gagern | 03 April 2013, 19:54:33 UTC | Documentation: Strip texinfo anchors to avoid duplicates This keeps texinfo 5.x happy. See https://bugs.gentoo.org/464210. Signed-off-by: Martin von Gagern <Martin.vGagern@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 23:14:19 UTC |
| 7b96d88 | John Keeping | 03 April 2013, 19:17:55 UTC | bisect: avoid signed integer overflow Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 19:49:14 UTC |
| e7b00c5 | John Keeping | 03 April 2013, 19:24:05 UTC | diffcore-break: don't divide by zero When the source file is empty, the calculation of the merge score results in a division by zero. In the situation: == preimage == == postimage == F (empty file) F (a large file) E (a new empty file) it does not make sense to consider F->E as a rename, so it is better not to break the pre- and post-image of F. Bail out early in this case to avoid hitting the divide-by-zero. This causes the merge score to be left at zero. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 19:48:02 UTC |
| 19534ee | Junio C Hamano | 03 April 2013, 16:29:14 UTC | Update draft release notes to 1.8.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 16:29:14 UTC |
| b771d8d | Junio C Hamano | 03 April 2013, 16:26:27 UTC | Merge branch 'mg/gpg-interface-using-status' into maint Verification of signed tags were not done correctly when not in C or en/US locale. * mg/gpg-interface-using-status: pretty: make %GK output the signing key for signed commits pretty: parse the gpg status lines rather than the output gpg_interface: allow to request status return log-tree: rely upon the check in the gpg_interface gpg-interface: check good signature in a reliable way | 03 April 2013, 16:26:27 UTC |
| 14c79b1 | Junio C Hamano | 03 April 2013, 16:26:07 UTC | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint 'git commit -m "$msg"' used to add an extra newline even when $msg already ended with one. * bc/commit-complete-lines-given-via-m-option: Documentation/git-commit.txt: rework the --cleanup section git-commit: only append a newline to -m mesg if necessary t7502: demonstrate breakage with a commit message with trailing newlines t/t7502: compare entire commit message with what was expected | 03 April 2013, 16:26:07 UTC |
| 295e393 | Junio C Hamano | 03 April 2013, 16:25:52 UTC | Merge branch 'jc/describe' into maint The "--match=<pattern>" option of "git describe", when used with "--all" to allow refs that are not annotated tags to be used as a base of description, did not restrict the output from the command to those that match the given pattern. * jc/describe: describe: --match=<pattern> must limit the refs even when used with --all | 03 April 2013, 16:25:52 UTC |
| eeecf39 | Junio C Hamano | 03 April 2013, 16:25:41 UTC | Merge branch 'jk/alias-in-bare' into maint An aliased command spawned from a bare repository that does not say it is bare with "core.bare = yes" is treated as non-bare by mistake. * jk/alias-in-bare: setup: suppress implicit "." work-tree for bare repos environment: add GIT_PREFIX to local_repo_env cache.h: drop LOCAL_REPO_ENV_SIZE | 03 April 2013, 16:25:41 UTC |
| e6658b9 | Junio C Hamano | 03 April 2013, 16:25:29 UTC | Merge branch 'ks/rfc2047-one-char-at-a-time' into maint When "format-patch" quoted a non-ascii strings on the header files, it incorrectly applied rfc2047 and chopped a single character in the middle of it. * ks/rfc2047-one-char-at-a-time: format-patch: RFC 2047 says multi-octet character may not be split | 03 April 2013, 16:25:29 UTC |
| a9dc3b6 | Junio C Hamano | 03 April 2013, 16:25:15 UTC | Merge branch 'jk/empty-archive' into maint "git archive" reports a failure when asked to create an archive out of an empty tree. It would be more intuitive to give an empty archive back in such a case. * jk/empty-archive: archive: handle commits with an empty tree test-lib: factor out $GIT_UNZIP setup | 03 April 2013, 16:25:15 UTC |
| 9e72a56 | Junio C Hamano | 03 April 2013, 16:24:51 UTC | Merge branch 'ph/tag-force-no-warn-on-creation' into maint "git tag -f <tag>" always said "Updated tag '<tag>'" even when creating a new tag (i.e. not overwriting nor updating). * ph/tag-force-no-warn-on-creation: tag: --force does not have to warn when creating tags | 03 April 2013, 16:24:51 UTC |
| fa0a6a4 | Junio C Hamano | 03 April 2013, 16:24:18 UTC | Merge branch 'lf/setup-prefix-pathspec' into maint "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and instead the parser kept reading beyond the end of the string. * lf/setup-prefix-pathspec: setup.c: check that the pathspec magic ends with ")" setup.c: stop prefix_pathspec() from looping past the end of string | 03 April 2013, 16:24:19 UTC |
| 92e0d91 | Junio C Hamano | 03 April 2013, 16:18:01 UTC | Sync with 1.8.1 maintenance track * maint-1.8.1: Start preparing for 1.8.1.6 git-tag(1): we tag HEAD by default Fix revision walk for commits with the same dates t2003: work around path mangling issue on Windows pack-refs: add fully-peeled trait pack-refs: write peeled entry for non-tags use parse_object_or_die instead of die("bad object") avoid segfaults on parse_object failure entry: fix filter lookup t2003: modernize style name-hash.c: fix endless loop with core.ignorecase=true | 03 April 2013, 16:18:01 UTC |
| 072dda6 | Junio C Hamano | 03 April 2013, 16:12:11 UTC | Start preparing for 1.8.1.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 16:12:11 UTC |
| c81e2c6 | Junio C Hamano | 03 April 2013, 15:44:54 UTC | Merge branch 'kb/name-hash' into maint-1.8.1 * kb/name-hash: name-hash.c: fix endless loop with core.ignorecase=true | 03 April 2013, 15:44:54 UTC |
| 6437980 | Junio C Hamano | 03 April 2013, 15:44:02 UTC | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1 * kk/revwalk-slop-too-many-commit-within-a-second: Fix revision walk for commits with the same dates | 03 April 2013, 15:44:02 UTC |
| 67ff3d2 | Junio C Hamano | 03 April 2013, 15:43:40 UTC | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1 * jk/checkout-attribute-lookup: t2003: work around path mangling issue on Windows entry: fix filter lookup t2003: modernize style | 03 April 2013, 15:43:40 UTC |
| f1ad05f | Junio C Hamano | 03 April 2013, 15:43:03 UTC | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 * jk/fully-peeled-packed-ref: pack-refs: add fully-peeled trait pack-refs: write peeled entry for non-tags use parse_object_or_die instead of die("bad object") avoid segfaults on parse_object failure | 03 April 2013, 15:43:03 UTC |
| 8f780ca | Junio C Hamano | 03 April 2013, 15:37:39 UTC | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1 * ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap | 03 April 2013, 15:37:39 UTC |
| 0311e37 | Junio C Hamano | 03 April 2013, 15:36:52 UTC | Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1 * yd/doc-merge-annotated-tag: Documentation: merging a tag is a special case | 03 April 2013, 15:36:52 UTC |
| 357d7f1 | Junio C Hamano | 03 April 2013, 15:36:10 UTC | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1 * ap/maint-update-index-h-is-for-help: update-index: allow "-h" to also display options | 03 April 2013, 15:36:10 UTC |
| a134a60 | Junio C Hamano | 03 April 2013, 15:35:45 UTC | Merge branch 'jc/perl-cat-blob' into maint-1.8.1 * jc/perl-cat-blob: Git.pm: fix cat_blob crashes on large files | 03 April 2013, 15:35:45 UTC |
| d7df695 | Junio C Hamano | 03 April 2013, 15:35:33 UTC | Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1 * ob/imap-send-ssl-verify: imap-send: support Server Name Indication (RFC4366) | 03 April 2013, 15:35:33 UTC |
| f4254d1 | Junio C Hamano | 03 April 2013, 15:35:06 UTC | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 * nd/index-pack-l10n-buf-overflow: index-pack: fix buffer overflow caused by translations | 03 April 2013, 15:35:06 UTC |
| dd686cd | Thomas Rast | 03 April 2013, 14:27:14 UTC | git-tag(1): we tag HEAD by default The <commit>|<object> argument is actually not explained anywhere (except implicitly in the description of an unannotated tag). Write a little explanation, in particular to cover the default. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2013, 15:33:56 UTC |
| 40a0f84 | Junio C Hamano | 01 April 2013, 16:23:05 UTC | Update draft release notes to 1.8.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2013, 16:23:05 UTC |
| b76a9e1 | Junio C Hamano | 01 April 2013, 16:19:46 UTC | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint * ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap | 01 April 2013, 16:19:47 UTC |
| 5753e17 | Junio C Hamano | 01 April 2013, 16:19:41 UTC | Merge branch 'rr/tests-dedup-test-config' into maint * rr/tests-dedup-test-config: t4018,7810,7811: remove test_config() redefinition | 01 April 2013, 16:19:42 UTC |
| 432930b | Junio C Hamano | 01 April 2013, 16:19:40 UTC | Merge branch 'yd/doc-is-in-asciidoc' into maint * yd/doc-is-in-asciidoc: CodingGuidelines: our documents are in AsciiDoc | 01 April 2013, 16:19:40 UTC |
| ab24e75 | Junio C Hamano | 01 April 2013, 16:19:37 UTC | Merge branch 'yd/doc-merge-annotated-tag' into maint * yd/doc-merge-annotated-tag: Documentation: merging a tag is a special case | 01 April 2013, 16:19:37 UTC |
| fec274b | Junio C Hamano | 01 April 2013, 16:19:30 UTC | Merge branch 'tb/document-status-u-tradeoff' into maint * tb/document-status-u-tradeoff: status: advise to consider use of -u when read_directory takes too long git status: document trade-offs in choosing parameters to the -u option | 01 April 2013, 16:19:30 UTC |
| 41e603a | Junio C Hamano | 01 April 2013, 16:19:04 UTC | Merge branch 'da/downcase-u-in-usage' into maint * da/downcase-u-in-usage: contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string contrib/examples/git-remote.perl: use a lowercase "usage:" string tests: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string Documentation/user-manual.txt: use a lowercase "usage:" string templates/hooks--update.sample: use a lowercase "usage:" string contrib/hooks/setgitperms.perl: use a lowercase "usage:" string contrib/examples: use a lowercase "usage:" string contrib/fast-import/import-zips.py: use spaces instead of tabs contrib/fast-import/import-zips.py: fix broken error message contrib/fast-import: use a lowercase "usage:" string contrib/credential: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string git-cvsexportcommit: use a lowercase "usage:" string git-archimport: use a lowercase "usage:" string git-merge-one-file: use a lowercase "usage:" string git-relink: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string git-sh-setup: use a lowercase "usage:" string | 01 April 2013, 16:19:04 UTC |
| 862ae6c | René Scharfe | 01 April 2013, 13:06:27 UTC | submodule summary: support --summary-limit=<n> In addition to "--summary-limit <n>" support the form "--summary-limit=<n>", for consistency with other parameters and commands. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2013, 14:37:34 UTC |
| a47eab0 | Ramkumar Ramachandra | 01 April 2013, 01:40:42 UTC | send-email: use the three-arg form of open in recipients_cmd Perlcritic does not want to see the trailing pipe in the two-args form of open(), i.e. open my $fh, "$cmd \Q$file\E |"; If $cmd were a single-token command name, it would make a lot more sense to use four-or-more-args form "open FILEHANDLE,MODE,CMD,ARGS" to avoid shell from expanding metacharacters in $file, but we do expect multi-word string in $to_cmd and $cc_cmd to be expanded by the shell, so we cannot rewrite it to open my $fh, "-|", $cmd, $file; for extra safety. At least, by using this in the three-arg form: open my $fh, "-|", "$cmd \Q$file\E"; we can silence Perlcritic, even though we do not gain much safety by doing so. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2013, 04:30:27 UTC |
| 9b39703 | Ramkumar Ramachandra | 01 April 2013, 01:40:41 UTC | send-email: drop misleading function prototype The subroutine check_file_rev_conflict() is called from two places, both of which expects to pass a single scalar variable and see if that can be interpreted as a pathname or a revision name. It is defined with a function prototype ($) to force a scalar context while evaluating the arguments at the calling site but it does not help the current calling sites. The only effect it has is to hurt future calling sites that may want to build an argument list in an array variable and call it as check_file_rev_confict(@args). Drop the misleading prototype, as Perlcritic suggests. While at it, rename the function to avoid new call sites unaware of this change arising and add a comment clarifying what this function is for. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2013, 04:30:27 UTC |
| 622bc93 | Ramkumar Ramachandra | 01 April 2013, 01:40:40 UTC | send-email: use "return;" not "return undef;" on error codepaths All the callers of "ask", "extract_valid_address", and "validate_patch" subroutines assign the return values from them to a single scalar: $var = subr(...); and "return undef;" in these subroutine can safely be turned into a simpler "return;". Doing so will also future-proof a new caller that mistakenly does this: @foo = ask(...); if (@foo) { ... we got an answer ... } else { ... we did not ... } Note that we leave "return undef;" in validate_address on purpose, even though Perlcritic may complain. The primary "return" site of the function returns whatever is in the scalar variable $address, so it is pointless to change only the other "return undef;" to "return". The caller must be prepared to see an array with a single undef as the return value from this subroutine anyway. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2013, 04:30:09 UTC |
| 803a777 | Ramsay Jones | 26 March 2013, 19:20:11 UTC | cat-file: Fix an gcc -Wuninitialized warning After commit cbfd5e1c ("drop some obsolete "x = x" compiler warning hacks", 21-03-2013) removed a gcc specific hack, older versions of gcc now issue an "'contents' might be used uninitialized" warning. In order to suppress the warning, we simply initialize the variable to NULL in it's declaration. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2013, 06:47:00 UTC |
| 0a34594 | Ramsay Jones | 26 March 2013, 19:09:44 UTC | fast-import: Fix an gcc -Wuninitialized warning Commit cbfd5e1c ("drop some obsolete "x = x" compiler warning hacks", 21-03-2013) removed a gcc hack that suppressed an "might be used uninitialized" warning issued by older versions of gcc. However, commit 3aa99df8 ('fast-import: clarify "inline" logic in file_change_m', 21-03-2013) addresses an (almost) identical issue (with very similar code), but includes additional code in it's resolution. The solution used by this commit, unlike that used by commit cbfd5e1c, also suppresses the -Wuninitialized warning on older versions of gcc. In order to suppress the warning (against the 'oe' symbol) in the note_change_n() function, we adopt the same solution used by commit 3aa99df8. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2013, 06:46:55 UTC |
| efa5f82 | Jeff King | 28 March 2013, 21:50:04 UTC | t: check that a pattern without trailing slash matches a directory Prior to v1.8.1.1, with: git init echo content >foo && mkdir subdir && echo content >subdir/bar && echo "subdir export-ignore" >.gitattributes git add . && git commit -m one && git archive HEAD | tar tf - the resulting archive would contain only "foo" and ".gitattributes", not subdir. This was broken with a recent change that intended to allow "subdir/ export-ignore" to also exclude the directory, but instead ended up _requiring_ the trailing slash by mistake. A pattern "subdir" should match any path "subdir", whether it is a directory or a non-directory. A pattern "subdir/" insists that a path "subdir" must be a directory for it to match. This patch adds test not just for this simple case, but also for deeper cross-directory cases, as well as cases with wildcards. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2013, 04:48:27 UTC |
| ab3aebc | Jeff King | 28 March 2013, 21:48:21 UTC | dir.c::match_pathname(): pay attention to the length of string parameters This function takes two counted strings: a <pattern, patternlen> pair and a <pathname, pathlen> pair. But we end up feeding the result to fnmatch, which expects NUL-terminated strings. We can fix this by calling the fnmatch_icase_mem function, which handles re-allocating into a NUL-terminated string if necessary. While we're at it, we can avoid even calling fnmatch in some cases. In addition to patternlen, we get "prefix", the size of the pattern that contains no wildcard characters. We do a straight match of the prefix part first, and then use fnmatch to cover the rest. But if there are no wildcards in the pattern at all, we do not even need to call fnmatch; we would simply be comparing two empty strings. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2013, 04:48:18 UTC |
| 982ac87 | Jeff King | 28 March 2013, 21:47:47 UTC | dir.c::match_pathname(): adjust patternlen when shifting pattern If we receive a pattern that starts with "/", we shift it forward to avoid looking at the "/" part. Since the prefix and patternlen parameters are counts of what is in the pattern, we must decrement them as we increment the pointer. We remembered to handle prefix, but not patternlen. This didn't cause any bugs, though, because the patternlen parameter is not actually used. Since it will be used in future patches, let's correct this oversight. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2013, 04:48:18 UTC |
| 0b6e56d | Junio C Hamano | 28 March 2013, 21:47:28 UTC | dir.c::match_basename(): pay attention to the length of string parameters The function takes two counted strings (<basename, basenamelen> and <pattern, patternlen>) as parameters, together with prefix (the length of the prefix in pattern that is to be matched literally without globbing against the basename) and EXC_* flags that tells it how to match the pattern against the basename. However, it did not pay attention to the length of these counted strings. Update them to do the following: * When the entire pattern is to be matched literally, the pattern matches the basename only when the lengths of them are the same, and they match up to that length. * When the pattern is "*" followed by a string to be matched literally, make sure that the basenamelen is equal or longer than the "literal" part of the pattern, and the tail of the basename string matches that literal part. * Otherwise, use the new fnmatch_icase_mem helper to make sure we only lookmake sure we use only look at the counted part of the strings. Because these counted strings are full strings most of the time, we check for termination to avoid unnecessary allocation. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2013, 04:48:12 UTC |
| dc09e9e | Junio C Hamano | 28 March 2013, 21:49:13 UTC | attr.c::path_matches(): special case paths that end with a slash The function is given a string that ends with a slash to signal that the path is a directory to make sure that a pattern that ends with a slash (i.e. MUSTBEDIR) can tell directories and non-directories apart. However, the pattern itself (pat->pattern and pat->patternlen) that came from such a MUSTBEDIR pattern is represented as a string that ends with a slash, but patternlen does not count that trailing slash. A MUSTBEDIR pattern "element/" is represented as a counted string <"element/", 7> and this must match match pathname "element/". Because match_basename() and match_pathname() want to see pathname "element" to match against the pattern <"element/", 7>, reduce the length of the path to exclude the trailing slash when calling these functions. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2013, 04:47:06 UTC |
| 5e950c2 | Junio C Hamano | 28 March 2013, 21:34:07 UTC | Merge branch 'maint-1.8.1' into maint * maint-1.8.1: git help config: s/insn/instruction/ | 28 March 2013, 21:34:07 UTC |
| c68c408 | Junio C Hamano | 28 March 2013, 15:39:39 UTC | t5516: test interaction between pushURL and pushInsteadOf correctly 1c2eafb89bca (Add url.<base>.pushInsteadOf: URL rewriting for push only, 2009-09-07) wants to make sure that a push destination read from URL is not rewritten by pushInsteadOf because an explicit pushURL exists; for that, a pushInsteadOf rewrite rule for the value of remote.r.URL is set to a non-existent is set up. We would also want to make sure that pushInsteadOf rewrite rule is not applied to the location read from pushURL. This way, we will make sure that - "testrepo/" (pushURL) gets updated; - the push does not try to update "trash2/" (the result of applying pushInsteadOf to pushURL); - the push does not try to update "trash3/" (the result of applying pushInsteadOf to URL). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2013, 20:53:27 UTC |
| 3322ad4 | Matthias Krüger | 27 March 2013, 22:53:50 UTC | git help config: s/insn/instruction/ "insn" appears to be an in-code abbreviation and should not appear in manual/help pages. Signed-off-by: Matthias Krüger <matthias.krueger@famsik.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2013, 15:53:47 UTC |
| 9a82efd | Junio C Hamano | 27 March 2013, 17:57:57 UTC | More fixes for 1.8.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2013, 17:57:57 UTC |
| d011ab4 | Junio C Hamano | 27 March 2013, 17:51:10 UTC | Merge branch 'maint-1.8.1' into maint * maint-1.8.1: merge-tree: fix typo in merge-tree.c::unresolved git-commit doc: describe use of multiple `-m` options git-pull doc: fix grammo ("conflicts" is plural) | 27 March 2013, 17:51:10 UTC |
| 187c00c | John Keeping | 27 March 2013, 15:58:50 UTC | merge-tree: fix typo in merge-tree.c::unresolved When calculating whether there is a d/f conflict, the calculation of whether both sides are directories generates an incorrect references mask because it does not use the loop index to set the correct bit. Fix this typo. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2013, 17:00:50 UTC |
| 6bf6366 | Christian Helmuth | 27 March 2013, 14:19:35 UTC | git-commit doc: describe use of multiple `-m` options The text is copied from Documentation/git-tag.txt. Signed-off-by: Christian Helmuth <christian.helmuth@genode-labs.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2013, 16:32:02 UTC |
| 38ef8a7 | Mihai Capotă | 27 March 2013, 11:04:51 UTC | git-pull doc: fix grammo ("conflicts" is plural) Signed-off-by: Mihai Capotă <mihai@mihaic.ro> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2013, 16:30:54 UTC |
| 3bbbf18 | Junio C Hamano | 26 March 2013, 19:53:49 UTC | More corrections for 1.8.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2013, 20:14:20 UTC |
| f4ccd9f | Junio C Hamano | 26 March 2013, 20:14:11 UTC | Merge branch 'maint-1.8.1' into maint * maint-1.8.1: Correct the docs about GIT_SSH. | 26 March 2013, 20:14:11 UTC |
| 50734ea | Junio C Hamano | 26 March 2013, 19:44:26 UTC | Merge branch 'we/submodule-update-prefix-output' into maint "git submodule update", when recursed into sub-submodules, did not acccumulate the prefix paths. * we/submodule-update-prefix-output: submodule update: when using recursion, show full path | 26 March 2013, 19:44:27 UTC |
| ece12fd | Junio C Hamano | 26 March 2013, 19:44:11 UTC | Merge branch 'jk/mailsplit-maildir-muttsort' into maint Sort filenames read from the maildir/ in a way that is more likely to sort messages in the order the writing MUA meant to, by sorting numeric segment in numeric order and non-numeric segment in alphabetical order. * jk/mailsplit-maildir-muttsort: mailsplit: sort maildir filenames more cleverly | 26 March 2013, 19:44:11 UTC |
| 7d2726c | Junio C Hamano | 26 March 2013, 19:43:49 UTC | Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint When export-subst is used, "zip" output recorded incorrect size of the file. * rs/zip-compresssed-size-with-export-subst: archive-zip: fix compressed size for stored export-subst files | 26 March 2013, 19:43:49 UTC |
| d7cccbb | Junio C Hamano | 26 March 2013, 19:43:25 UTC | Merge branch 'jk/utf-8-can-be-spelled-differently' into maint Some platforms and users spell UTF-8 differently; retry with the most official "UTF-8" when the system does not understand the user-supplied encoding name that are the common alternative spellings of UTF-8. * jk/utf-8-can-be-spelled-differently: utf8: accept alternate spellings of UTF-8 | 26 March 2013, 19:43:25 UTC |
| 307d68e | Junio C Hamano | 26 March 2013, 19:43:05 UTC | Merge branch 'nd/branch-error-cases' into maint "git branch" had more cases where it did not bother to check nonsense command line parameters. * nd/branch-error-cases: branch: segfault fixes and validation | 26 March 2013, 19:43:05 UTC |
| 6201eb3 | Junio C Hamano | 26 March 2013, 19:42:42 UTC | Merge branch 'ap/maint-update-index-h-is-for-help' into maint "git update-index -h" did not do the usual "-h(elp)" thing. * ap/maint-update-index-h-is-for-help: update-index: allow "-h" to also display options | 26 March 2013, 19:42:42 UTC |
| 06d7abb | Junio C Hamano | 26 March 2013, 19:42:24 UTC | Merge branch 'jc/perl-cat-blob' into maint perl/Git.pm::cat_blob slurped everything in core only to write it out to a file descriptor, which was not a very smart thing to do. * jc/perl-cat-blob: Git.pm: fix cat_blob crashes on large files | 26 March 2013, 19:42:24 UTC |
| 2a5964a | Junio C Hamano | 26 March 2013, 19:41:59 UTC | Merge branch 'ob/imap-send-ssl-verify' into maint Correctly connect to SSL/TLS sites that serve multiple hostnames on a single IP by including Server Name Indication in the client-hello. * ob/imap-send-ssl-verify: imap-send: support Server Name Indication (RFC4366) | 26 March 2013, 19:41:59 UTC |
| 4bb2121 | Junio C Hamano | 26 March 2013, 19:40:19 UTC | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint * nd/index-pack-l10n-buf-overflow: index-pack: fix buffer overflow caused by translations | 26 March 2013, 19:40:19 UTC |
