| bd01c6d | Junio C Hamano | 02 December 2010, 20:18:49 UTC | Git 1.7.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 20:18:49 UTC |
| cbcab75 | Junio C Hamano | 02 December 2010, 20:06:06 UTC | Git 1.7.0.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 20:13:27 UTC |
| e760924 | Junio C Hamano | 02 December 2010, 00:37:34 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors | 02 December 2010, 00:37:34 UTC |
| 6b3020a | Jonathan Nieder | 01 December 2010, 18:36:15 UTC | add: introduce add.ignoreerrors synonym for add.ignore-errors The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2010, 21:40:12 UTC |
| 520ea85 | Matthieu Moy | 28 August 2010, 18:18:36 UTC | t0003: add missing && at end of lines Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2010, 05:36:32 UTC |
| 245b10c | Junio C Hamano | 27 July 2010, 22:04:49 UTC | Git 1.7.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 23:36:51 UTC |
| e5498e8 | Junio C Hamano | 27 July 2010, 22:01:36 UTC | Sync with 1.7.0 series | 27 July 2010, 22:01:36 UTC |
| 593ce2b | Junio C Hamano | 27 July 2010, 21:07:41 UTC | Git 1.7.0.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 21:09:11 UTC |
| 79bf149 | Jonathan Nieder | 26 July 2010, 15:06:51 UTC | config --get --path: check for unset $HOME If $HOME is unset (as in some automated build situations), currently git config --path path.home "~" git config --path --get path.home segfaults. Error out with Failed to expand user dir in: '~/' instead. Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 17:58:46 UTC |
| c4818fa | Junio C Hamano | 26 July 2010, 04:53:27 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: request-pull.txt: Document -p option Check size of path buffer before writing into it | 26 July 2010, 04:53:27 UTC |
| 28bf4ba | Junio C Hamano | 26 July 2010, 04:52:48 UTC | Merge branch 'maint-1.6.6' into maint-1.7.0 * maint-1.6.6: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:48 UTC |
| ad33605 | Junio C Hamano | 26 July 2010, 04:52:29 UTC | Merge branch 'maint-1.6.5' into maint-1.6.6 * maint-1.6.5: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:29 UTC |
| d8e3ac7 | Stephen Boyd | 23 July 2010, 16:31:27 UTC | request-pull.txt: Document -p option Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 04:52:19 UTC |
| a07b10c | Junio C Hamano | 26 July 2010, 04:51:58 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:51:58 UTC |
| 1b0b962 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2010, 17:33:47 UTC |
| 971ecbd | Brandon Casey | 20 July 2010, 17:17:12 UTC | t/README: clarify test_must_fail description Some have found the wording of the description to be somewhat ambiguous with respect to when it is desirable to use test_must_fail instead of "! <git-command>". Tweak the wording somewhat to hopefully clarify that it is _because_ test_must_fail can detect segmentation fault that it is desirable to use it instead of "! <git-command>". Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 18:26:39 UTC |
| 3c9d041 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 16:17:39 UTC |
| c173dad | Ralf Thielow | 19 July 2010, 16:26:12 UTC | update-server-info: Shorten read_pack_info_file() The correct responses to a D and a T line in .git/objects/info/packs are the same, so combine their case arms. In both cases we already ‘goto’ out of the switch so while at it, remove a redundant ‘break’ to avoid yet another line of code. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Reviewed-by: Jonathan Nieder <jrnieder <at> gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 18:13:52 UTC |
| d1cc462 | David Aguilar | 18 July 2010, 01:46:48 UTC | Documentation: Explain git-mergetool's use of temporary files 'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 16:16:09 UTC |
| 0ad0a61 | Jonathan Nieder | 15 July 2010, 07:51:19 UTC | Documentation: add submodule.* to the big configuration variable list The url, path, and the update items in [submodule "foo"] stanzas are nicely explained in the .gitmodules and ‘git submodule’ documentation. Point there from the config documentation. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 July 2010, 19:00:50 UTC |
| 47dc5d5 | Jonathan Nieder | 15 July 2010, 07:41:55 UTC | gitmodules.5: url can be a relative path There is already excellent documentation for this facility in git-submodule.1, but it is not so discoverable. Relative paths in .gitmodules can be useful for serving the same repository over multiple protocols, for example. Thanks to Peter for pointing this out. Cc: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 July 2010, 18:59:57 UTC |
| 109988f | Pavan Kumar Sunkara | 15 July 2010, 07:29:01 UTC | gitweb: fix esc_url Earlier, 452e225 (gitweb: fix esc_param, 2009-10-13) fixed CGI escaping rules used in esc_url. A very similar logic exists in esc_param and needs to be fixed the same way. Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 July 2010, 18:59:37 UTC |
| 1b79d1c | Oren Held | 13 July 2010, 12:01:40 UTC | git fetch documentation: describe short '-p' synonym to '--prune' option It's already implemented, just undocumented. Signed-off-by: Oren Held <orenhe@il.ibm.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 July 2010, 16:13:34 UTC |
| 312a30e | Miklos Vajna | 12 July 2010, 18:58:38 UTC | format-patch: document the format.to configuration setting [jc: with simplification from Jonathan Nieder] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 July 2010, 16:02:59 UTC |
| 5d1e341 | Fredrik Skolmli | 10 July 2010, 00:00:01 UTC | Documentation: Spelling fix in protocol-capabilities.txt Signed-off-by: Fredrik Skolmli <fredrik@frsk.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 July 2010, 00:36:28 UTC |
| 142183d | Nicolas Sebrecht | 09 July 2010, 20:27:48 UTC | checkout: accord documentation to what git does Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 July 2010, 23:28:21 UTC |
| 0e418e5 | Johannes Sixt | 09 July 2010, 07:05:16 UTC | t0005: work around strange $? in ksh when program terminated by a signal ksh93 is known to report $? of programs that terminated by a signal as 256 + signal number instead of 128 + signal number like other POSIX compliant shells (ksh's behavior is still POSIX compliant in this regard). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 July 2010, 23:27:31 UTC |
| c30e742 | Junio C Hamano | 07 July 2010, 17:36:19 UTC | backmerge a few more fixes to 1.7.1.X series Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 18:16:32 UTC |
| 878bd80 | Junio C Hamano | 07 July 2010, 18:13:40 UTC | Merge branch 'maint-1.6.4' into maint * maint-1.6.4: rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 07 July 2010, 18:13:40 UTC |
| 2998138 | Uwe Kleine-König | 06 July 2010, 14:46:05 UTC | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option The ?: operator has a lower priority than |, so the implicit associativity made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and PARSE_OPT_SHELL_EVAL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 18:11:50 UTC |
| 8e99859 | Junio C Hamano | 07 July 2010, 17:34:04 UTC | Merge branch 'mg/doc-rev-parse-treepath-syntax' into maint * mg/doc-rev-parse-treepath-syntax: git-rev-parse.txt: Add more examples for caret and colon git-rev-parse.txt: Document ":path" specifier | 07 July 2010, 17:34:04 UTC |
| 56bface | Junio C Hamano | 07 July 2010, 17:25:15 UTC | Merge branch 'tr/receive-pack-aliased-update-fix' into maint * tr/receive-pack-aliased-update-fix: check_aliased_update: strcpy() instead of strcat() to copy receive-pack: detect aliased updates which can occur with symrefs receive-pack: switch global variable 'commands' to a parameter Conflicts: t/t5516-fetch-push.sh | 07 July 2010, 17:25:15 UTC |
| 765c225 | Pierre Habouzit | 07 July 2010, 07:47:20 UTC | fix git branch -m in presence of cross devices When you have for example a bare repository stored on NFS, and that you create new workdirs locally (using contrib's git-new-workdir), logs/refs is a symlink to a different device. Hence when the reflogs are renamed, all must happen below logs/refs or one gets cross device rename errors like: git branch -m foo error: unable to move logfile logs/refs/heads/master to tmp-renamed-log: Invalid cross-device link fatal: Branch rename failed The fix is hence to use logs/refs/.tmp-renamed-log as a temporary log name, instead of just tmp-renamed-log. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 16:17:00 UTC |
| 420432d | Heiko Voigt | 06 July 2010, 19:34:31 UTC | add missing && to submodule-merge testcase Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 04:28:55 UTC |
| d66ee04 | Jeff King | 06 July 2010, 07:54:33 UTC | test-date: fix sscanf type conversion Reading into a time_t isn't portable, since we don't know the exact type. Instead, use an unsigned long, which is what show_date wants, anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2010, 15:42:15 UTC |
| b4cf0f1 | Dylan Reid | 06 July 2010, 03:11:17 UTC | xdiff: optimise for no whitespace difference when ignoring whitespace. In xdl_recmatch, do the memcmp to check if the two lines are equal before checking if whitespace flags are set. If the lines are identical, then there is no need to check if they differ only in whitespace. This makes the common case (there is no whitespace difference) faster. It costs the case where lines are the same length and contain whitespace differences, but the common case is more than 20% faster. Signed-off-by: Dylan Reid <dgreid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2010, 06:27:41 UTC |
| 6b09778 | Jeff King | 04 July 2010, 10:48:35 UTC | t0006: test timezone parsing Previously, test-date simply ignored the parsed timezone and told show_date() to use UTC. Instead, let's print out what we actually parsed. While we're at it, let's make it easy for tests to work in a specific timezone. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 July 2010, 18:54:50 UTC |
| 2c64034 | Michael J Gruber | 05 July 2010, 13:15:20 UTC | rerere.txt: Document forget subcommand dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) introduced the forget subcommand for rerere. Document it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 July 2010, 18:51:20 UTC |
| 66bd8ab | Chris Packham | 30 June 2010, 20:41:27 UTC | Documentation/git-gc.txt: add reference to githooks This advertises the existence of the 'pre-auto-gc' hook and adds a cross reference to where the hook is documented. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 July 2010, 17:41:20 UTC |
| a146392 | Junio C Hamano | 29 June 2010, 16:59:56 UTC | Git 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 16:59:56 UTC |
| 3183286 | Brandon Casey | 28 June 2010, 22:46:22 UTC | t/t9001: use egrep when regular expressions are involved Supplying backslashed, extended regular expressions to grep is not portable. Use egrep instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 16:31:48 UTC |
| b8a6610 | Michael J Gruber | 28 June 2010, 19:01:07 UTC | git-rev-parse.txt: Add more examples for caret and colon Several items in the caret, colon and friends section contain examples already. Make sure they all come with examples, and that examples come early so that they serve as a visual guide, as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 15:48:19 UTC |
| edac188 | Junio C Hamano | 29 June 2010, 00:42:18 UTC | Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 00:42:18 UTC |
| 54fcb21 | Junio C Hamano | 28 June 2010, 23:19:03 UTC | Merge branch 'tr/send-email-8bit' into maint * tr/send-email-8bit: send-email: ask about and declare 8bit mails | 28 June 2010, 23:19:03 UTC |
| d60ad81 | Junio C Hamano | 28 June 2010, 23:18:58 UTC | Merge branch 'pb/maint-perl-errmsg-no-dir' into maint * pb/maint-perl-errmsg-no-dir: Git.pm: better error message | 28 June 2010, 23:18:58 UTC |
| 339aec7 | Junio C Hamano | 28 June 2010, 23:18:43 UTC | Merge branch 'js/maint-am-rebase-invalid-author' into maint * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing | 28 June 2010, 23:18:43 UTC |
| 6c1c442 | Junio C Hamano | 28 June 2010, 23:18:15 UTC | Merge branch 'jc/maint-simpler-common-prefix' into maint * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes | 28 June 2010, 23:18:15 UTC |
| 54dc783 | Junio C Hamano | 28 June 2010, 23:18:02 UTC | Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal | 28 June 2010, 23:18:02 UTC |
| 89fe121 | Ramsay Jones | 21 June 2010, 18:52:29 UTC | notes: Initialise variable to appease gcc gcc version 3.4.4 thinks that the 'cmp' variable could be used while uninitialised and complains thus: notes.c: In function `write_each_non_note_until': notes.c:719: warning: 'cmp' might be used uninitialized in \ this function Note that gcc versions 4.1.2 and 4.4.0 do not issue this warning. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2010, 17:01:26 UTC |
| bbb1b8a | Jeff King | 28 June 2010, 08:59:07 UTC | notes: check number of parameters to "git notes copy" Otherwise we may segfault with too few parameters. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Bert Wesarg <Bert.Wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2010, 16:15:15 UTC |
| 3f3abe3 | Michael J Gruber | 27 June 2010, 13:15:22 UTC | git-rev-parse.txt: Document ":path" specifier The empty treeish in ":path" means "index". This is actually a special case of the ":stage:path" syntax where it is documented, but mentioning it also together with "treeish:path" is helpful, so do it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 19:25:37 UTC |
| 9eafa12 | Ramsay Jones | 23 June 2010, 19:47:50 UTC | msvc: Fix some compiler warnings In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data Note that gcc issues a similar complaint about line 244 when compiling with -Wextra. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 18:04:16 UTC |
| 8b6d792 | Christian Couder | 25 June 2010, 02:16:24 UTC | Documentation: grep: fix asciidoc problem with -- Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "\--" will properly appear as "--". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 15:57:17 UTC |
| 4e0d7a8 | Ramsay Jones | 23 June 2010, 19:40:19 UTC | msvc: Fix some "expr evaluates to function" compiler warnings In particular, the following warning is issued while compiling notes.c: notes.c(927) : warning C4550: expression evaluates to a \ function which is missing an argument list along with identical warnings on lines 928, 1016 and 1017. In order to suppress the warning, we change the definition of combine_notes_fn, so that the symbol type is an (explicit) "pointer to function ...". As a result, several other declarations need some minor fix-up to take account of the new typedef. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 16:42:12 UTC |
| a4c2454 | Junio C Hamano | 22 June 2010, 16:18:55 UTC | Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2010, 16:33:03 UTC |
| b2ebbd8 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'ic/maint-rebase-i-abort' into maint * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out | 22 June 2010, 16:31:48 UTC |
| 81b43b5 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'cc/maint-commit-reflog-msg' into maint * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message | 22 June 2010, 16:31:48 UTC |
| abd3fd3 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'jk/maint-advice-empty-amend' into maint * jk/maint-advice-empty-amend: commit: give advice on empty amend | 22 June 2010, 16:31:48 UTC |
| b2a6095 | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'tc/commit-abbrev-fix' into maint * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output | 22 June 2010, 16:31:47 UTC |
| a7e664f | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'jn/document-rebase-i-p-limitation' into maint * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings | 22 June 2010, 16:31:47 UTC |
| 12575b7 | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'jn/checkout-doc' into maint * jn/checkout-doc: Documentation/checkout: clarify description Documentation/checkout: clarify description | 22 June 2010, 16:31:47 UTC |
| 3c65689 | Junio C Hamano | 22 June 2010, 16:04:14 UTC | Merge branch 'cc/maint-diff-CC-binary' into maint * cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c | 22 June 2010, 16:27:07 UTC |
| a8c4d92 | Junio C Hamano | 22 June 2010, 15:31:53 UTC | Merge branch 'jc/t9129-any-utf8' into maint * jc/t9129-any-utf8: t9129: fix UTF-8 locale detection | 22 June 2010, 15:31:53 UTC |
| 4b2405c | Junio C Hamano | 22 June 2010, 15:31:46 UTC | Merge branch 'cb/ls-files-cdup' into maint * cb/ls-files-cdup: ls-files: allow relative pathspec quote.c: separate quoting and relative path generation | 22 June 2010, 15:31:46 UTC |
| e3ed7f7 | Junio C Hamano | 22 June 2010, 15:31:25 UTC | Merge branch 'tc/merge-m-log' into maint * tc/merge-m-log: merge: --log appends shortlog to message if specified fmt-merge-msg: add function to append shortlog only fmt-merge-msg: refactor merge title formatting fmt-merge-msg: minor refactor of fmt_merge_msg() merge: rename variable merge: update comment t7604-merge-custom-message: show that --log doesn't append to -m t7604-merge-custom-message: shift expected output creation | 22 June 2010, 15:31:25 UTC |
| 958ff4a | Junio C Hamano | 22 June 2010, 15:31:20 UTC | Merge branch 'ph/clone-message-reword' into maint * ph/clone-message-reword: clone: reword messages to match the end-user perception | 22 June 2010, 15:31:20 UTC |
| 0d2416e | Junio C Hamano | 22 June 2010, 15:30:44 UTC | Merge branch 'jn/maint-amend-missing-name' into maint * jn/maint-amend-missing-name: commit --amend: cope with missing display name | 22 June 2010, 15:30:44 UTC |
| 21919d3 | Junio C Hamano | 22 June 2010, 15:30:38 UTC | Merge branch 'pc/remove-warn' into maint * pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function | 22 June 2010, 15:30:38 UTC |
| e0ae1e6 | Junio C Hamano | 21 June 2010, 18:18:54 UTC | tests: remove unnecessary '^' from 'expr' regular expression As Brandon noticed, a regular expression match given to 'expr' is already anchored at the beginning. Some versions of expr even complain about this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 18:18:54 UTC |
| 9932977 | Junio C Hamano | 21 June 2010, 12:48:18 UTC | Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 12:48:18 UTC |
| e7e1bf0 | Junio C Hamano | 21 June 2010, 12:41:03 UTC | Merge branch 'mc/maint-zoneparse' into maint * mc/maint-zoneparse: Add "Z" as an alias for the timezone "UTC" | 21 June 2010, 12:41:03 UTC |
| 7a0d54f | Junio C Hamano | 21 June 2010, 12:40:57 UTC | Merge branch 'jk/diff-m-doc' into maint * jk/diff-m-doc: docs: clarify meaning of -M for git-log | 21 June 2010, 12:40:57 UTC |
| b178478 | Junio C Hamano | 21 June 2010, 12:40:53 UTC | Merge branch 'jn/maint-doc-ignore' into maint * jn/maint-doc-ignore: gitignore.5: Clarify matching rules | 21 June 2010, 12:40:53 UTC |
| 065a652 | Junio C Hamano | 21 June 2010, 12:40:48 UTC | Merge branch 'bs/userdiff-php' into maint * bs/userdiff-php: diff: Support visibility modifiers in the PHP hunk header regexp | 21 June 2010, 12:40:48 UTC |
| 951f92d | Junio C Hamano | 21 June 2010, 12:40:41 UTC | Merge branch 'jk/maint-sha1-file-name-fix' into maint * jk/maint-sha1-file-name-fix: remove over-eager caching in sha1_file_name | 21 June 2010, 12:40:41 UTC |
| d0780b0 | Junio C Hamano | 21 June 2010, 12:40:33 UTC | Merge branch 'jk/maint-pull-dry-run-noop' into maint * jk/maint-pull-dry-run-noop: pull: do nothing on --dry-run | 21 June 2010, 12:40:33 UTC |
| cb2af93 | Junio C Hamano | 21 June 2010, 12:40:10 UTC | Merge branch 'bw/diff-metainfo-color' into maint * bw/diff-metainfo-color: diff: fix coloring of extended diff headers | 21 June 2010, 12:40:10 UTC |
| 443f26c | Junio C Hamano | 21 June 2010, 12:39:23 UTC | Merge branch 'cb/assume-unchanged-fix' into maint * cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged" | 21 June 2010, 12:39:23 UTC |
| 1b9fa0e | Junio C Hamano | 21 June 2010, 12:39:16 UTC | Merge branch 'jn/notes-doc' into maint * jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs Documentation/notes: document format of notes trees | 21 June 2010, 12:39:16 UTC |
| 6f79d66 | Junio C Hamano | 21 June 2010, 12:39:02 UTC | Merge branch 'ab/test-cleanup' into maint * ab/test-cleanup: Turn setup code in t2007-checkout-symlink.sh into a test Move t6000lib.sh to lib-* | 21 June 2010, 12:39:02 UTC |
| 6033553 | Junio C Hamano | 21 June 2010, 12:38:50 UTC | Merge branch 'rs/diff-no-minimal' into maint * rs/diff-no-minimal: git diff too slow for a file | 21 June 2010, 12:38:50 UTC |
| e1ba0f6 | Junio C Hamano | 21 June 2010, 12:38:36 UTC | Merge branch 'bg/apply-blank-trailing-context' into maint * bg/apply-blank-trailing-context: apply: Allow blank *trailing* context lines to match beyond EOF | 21 June 2010, 12:38:36 UTC |
| 7064994 | Jay Soffian | 18 June 2010, 21:01:25 UTC | gitweb/Makefile: fix typo in gitweb.min.css rule This typo has been in place since the rule was originally added by 0e6ce21 (Gitweb: add support for minifying gitweb.css). Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2010, 18:09:41 UTC |
| 64abcc4 | Philippe Bruhat (BooK) | 17 June 2010, 23:47:31 UTC | Git.pm: better error message Provide the bad directory name alongside with $! Note: $! is set if there is "No such file or directory", but isn't set if the file exists but is not a directory. Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2010, 15:49:03 UTC |
| 3cae7e5 | Thomas Rast | 17 June 2010, 20:10:39 UTC | send-email: ask about and declare 8bit mails git-send-email passes on an 8bit mail as-is even if it does not declare a content-type. Because the user can edit email between format-patch and send-email, such invalid mails are unfortunately not very hard to come by. Make git-send-email stop and ask about the encoding to use if it encounters any such mail. Also provide a configuration setting to permanently configure an encoding. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2010, 15:47:32 UTC |
| e53e6b4 | Brian Downing | 11 June 2010, 02:59:07 UTC | unpack-trees: Make index lookahead less pessimal When traversing trees with an index, the current index pointer (o->cache_bottom) occasionally has to be temporarily advanced forwards to match the traversal order of the tree, which is not the same as the sort order of the index. The existing algorithm that did this (introduced in 730f72840cc50c523fe4cdd796ea2d2fc4571a28) would get "stuck" when the cache_bottom was popped and then repeatedly check the same index entries over and over. This represents a serious performance regression for large repositories compared to the old "broken" traversal order. This commit makes a simple change to mitigate this. Whenever find_cache_pos sees that the current pos is also the cache_bottom, and it has already been unpacked, it advances the cache_bottom as well as the current pos. This prevents the above "sticking" behavior without dramatically changing the algorithm. In addition, this commit moves the unpacked check above the ce_in_traverse_path() check. The simple bitmask check is cheaper, and in the case described above will be firing quite a bit to advance the cache_bottom after a tree pop. This yields considerable performance improvements for large trees. The following are the number of function calls for "git diff HEAD" on the Linux kernel tree, with 33,307 files: Symbol Calls Before Calls After ------------------- ------------ ----------- unpack_callback 35,332 35,332 find_cache_pos 37,357 37,357 ce_in_traverse_path 4,979,473 37,357 do_compare_entry 6,828,181 251,925 df_name_compare 6,828,181 251,925 And on a repository of 187,456 files: Symbol Calls Before Calls After ------------------- ------------ ----------- unpack_callback 197,958 197,958 find_cache_pos 208,460 208,460 ce_in_traverse_path 37,308,336 208,460 do_compare_entry 156,950,469 2,690,626 df_name_compare 156,950,469 2,690,626 On the latter repository, user time for "git diff HEAD" was reduced from 5.58 to 0.42 seconds. This is compared to 0.30 seconds before the traversal order fix was implemented. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2010, 15:06:18 UTC |
| 45a0ee1 | Junio C Hamano | 16 June 2010, 23:56:53 UTC | Prepare draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2010, 00:00:53 UTC |
| 7e74a73 | Junio C Hamano | 16 June 2010, 23:33:47 UTC | Merge branch 'cw/maint-exec-defpath' into maint * cw/maint-exec-defpath: autoconf: Check if <paths.h> exists and set HAVE_PATHS_H exec_cmd.c: replace hard-coded path list with one from <paths.h> | 16 June 2010, 23:33:47 UTC |
| 356169c | Junio C Hamano | 16 June 2010, 23:32:15 UTC | Merge branch 'sc/http-late-auth' into maint * sc/http-late-auth: Prompt for a username when an HTTP request 401s | 16 June 2010, 23:32:15 UTC |
| 3b3b9a6 | Junio C Hamano | 16 June 2010, 23:23:51 UTC | Merge branch 'by/blame-doc-m-c' into maint * by/blame-doc-m-c: blame-options.txt: Add default value for `-M/-C` options. | 16 June 2010, 23:23:51 UTC |
| 91788cf | Junio C Hamano | 16 June 2010, 23:23:48 UTC | Merge branch 'cb/maint-stash-orphaned-file' into maint * cb/maint-stash-orphaned-file: stash tests: stash can lose data in a file removed from the index stash: Don't overwrite files that have gone from the index | 16 June 2010, 23:23:48 UTC |
| 2b7d947 | Junio C Hamano | 16 June 2010, 23:23:42 UTC | Merge branch 'mg/advice-statushints' into maint * mg/advice-statushints: wt-status: take advice.statusHints seriously t7508: test advice.statusHints | 16 June 2010, 23:23:42 UTC |
| e1c07fa | Junio C Hamano | 16 June 2010, 23:23:22 UTC | Merge branch 'jn/maint-bundle' into maint * jn/maint-bundle: fix "bundle --stdin" segfault t5704 (bundle): add tests for bundle --stdin | 16 June 2010, 23:23:22 UTC |
| db1cf2e | Junio C Hamano | 16 June 2010, 23:23:14 UTC | Merge branch 'rr/doc-submitting' into maint * rr/doc-submitting: SubmittingPatches: Add new section about what to base work on | 16 June 2010, 23:23:14 UTC |
| 82df0ef | Junio C Hamano | 16 June 2010, 23:22:57 UTC | Merge branch 'jn/t7006-fixup' into maint * jn/t7006-fixup: t7006: guard cleanup with test_expect_success | 16 June 2010, 23:22:57 UTC |
| 799c344 | Junio C Hamano | 16 June 2010, 23:22:51 UTC | Merge branch 'jn/shortlog' into maint * jn/shortlog: pretty: Respect --abbrev option shortlog: Document and test --format option t4201 (shortlog): Test output format with multiple authors t4201 (shortlog): guard setup with test_expect_success Documentation/shortlog: scripted users should not rely on implicit HEAD | 16 June 2010, 23:22:51 UTC |
| 318d401 | Junio C Hamano | 16 June 2010, 23:22:23 UTC | Merge branch 'np/index-pack-memsave' into maint * np/index-pack-memsave: index-pack: smarter memory usage when appending objects index-pack: rationalize unpack_entry_data() index-pack: smarter memory usage when resolving deltas | 16 June 2010, 23:22:23 UTC |
| 161cbf0 | Junio C Hamano | 16 June 2010, 23:21:30 UTC | Merge branch 'sp/maint-dumb-http-pack-reidx' into maint * sp/maint-dumb-http-pack-reidx: http.c::new_http_pack_request: do away with the temp variable filename http-fetch: Use temporary files for pack-*.idx until verified http-fetch: Use index-pack rather than verify-pack to check packs Allow parse_pack_index on temporary files Extract verify_pack_index for reuse from verify_pack Introduce close_pack_index to permit replacement http.c: Remove unnecessary strdup of sha1_to_hex result http.c: Don't store destination name in request structures http.c: Drop useless != NULL test in finish_http_pack_request http.c: Tiny refactoring of finish_http_pack_request t5550-http-fetch: Use subshell for repository operations http.c: Remove bad free of static block | 16 June 2010, 23:21:30 UTC |
| d6bf0cf | Junio C Hamano | 16 June 2010, 23:21:23 UTC | Merge branch 'jc/am-3-show-corrupted-patch' into maint * jc/am-3-show-corrupted-patch: am -3: recover the diagnostic messages for corrupt patches | 16 June 2010, 23:21:23 UTC |
| f62e53c | Junio C Hamano | 16 June 2010, 23:21:15 UTC | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint * sp/maint-describe-tiebreak-with-tagger-date: describe: Break annotated tag ties by tagger date tag.c: Parse tagger date (if present) tag.c: Refactor parse_tag_buffer to be saner to program tag.h: Remove unused signature field tag.c: Correct indentation | 16 June 2010, 23:21:15 UTC |
