| 12fb25d | Junio C Hamano | 23 November 2009, 03:16:01 UTC | Git v1.6.6-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 03:17:32 UTC |
| f341feb | Junio C Hamano | 23 November 2009, 03:04:30 UTC | Merge branch 'maint' * maint: Documentation: undocument gc'd function graph_release() | 23 November 2009, 03:04:30 UTC |
| c1c30ab | Junio C Hamano | 23 November 2009, 03:01:15 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git svn: strip leading path when making empty dirs git svn: always reuse existing remotes on fetch | 23 November 2009, 03:01:15 UTC |
| 9be30ee | Eric Wong | 23 November 2009, 02:11:32 UTC | git svn: strip leading path when making empty dirs Since unhandled.log stores paths relative to the repository root, we need to strip out leading path components if the directories we're tracking are not the repository root. Reported-by: Björn Steinbrink Signed-off-by: Eric Wong <normalperson@yhbt.net> | 23 November 2009, 02:15:42 UTC |
| 0a8a384 | Junio C Hamano | 23 November 2009, 00:41:54 UTC | Merge branch 'th/maint-remote-update-help-string' * th/maint-remote-update-help-string: Update 'git remote update' usage string to match man page. | 23 November 2009, 00:41:54 UTC |
| f81be17 | Junio C Hamano | 23 November 2009, 00:41:43 UTC | Merge branch 'jn/faster-completion-startup' * jn/faster-completion-startup: Speed up bash completion loading | 23 November 2009, 00:41:43 UTC |
| 0381886 | Junio C Hamano | 23 November 2009, 00:40:52 UTC | Merge branch 'rj/maint-t9700' * rj/maint-t9700: t9700-perl-git.sh: Fix a test failure on Cygwin | 23 November 2009, 00:40:52 UTC |
| 6d975c2 | Junio C Hamano | 23 November 2009, 00:40:26 UTC | Merge branch 'ls/maint-mailinfo-no-inbody' * ls/maint-mailinfo-no-inbody: git am/mailinfo: Don't look at in-body headers when rebasing | 23 November 2009, 00:40:26 UTC |
| 4075d27 | Junio C Hamano | 23 November 2009, 00:29:57 UTC | Merge branch 'mo/maint-crlf-doc' * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute | 23 November 2009, 00:29:57 UTC |
| f328f35 | Junio C Hamano | 23 November 2009, 00:29:50 UTC | Merge branch 'th/remote-usage' * th/remote-usage: git remote: Separate usage strings for subcommands | 23 November 2009, 00:29:50 UTC |
| 37e3b61 | Junio C Hamano | 23 November 2009, 00:28:46 UTC | Merge branch 'pb/maint-use-custom-perl' * pb/maint-use-custom-perl: Make sure $PERL_PATH is defined when the test suite is run. | 23 November 2009, 00:28:46 UTC |
| eb2fc8f | Junio C Hamano | 23 November 2009, 00:28:38 UTC | Merge branch 'mm/config-pathname-tilde-expand' * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template | 23 November 2009, 00:28:38 UTC |
| 3fa384d | Junio C Hamano | 23 November 2009, 00:28:29 UTC | Merge branch 'bc/grep-i-F' * bc/grep-i-F: grep: Allow case insensitive search of fixed-strings | 23 November 2009, 00:28:29 UTC |
| a1b01c4 | Junio C Hamano | 23 November 2009, 00:28:23 UTC | Merge branch 'jk/maint-break-rename-reduce-memory' * jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go | 23 November 2009, 00:28:23 UTC |
| 82f05d5 | Junio C Hamano | 23 November 2009, 00:28:14 UTC | Merge branch 'tc/format-attribute' * tc/format-attribute: Check the format of more printf-type functions | 23 November 2009, 00:28:14 UTC |
| c50230f | Junio C Hamano | 23 November 2009, 00:28:06 UTC | Merge branch 'tr/maint-merge-ours-clarification' (early part) * 'tr/maint-merge-ours-clarification' (early part): rebase docs: clarify --merge and --strategy Documentation: clarify 'ours' merge strategy | 23 November 2009, 00:28:06 UTC |
| 3288f20 | René Scharfe | 22 November 2009, 16:15:31 UTC | log --format: document %w Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:22:18 UTC |
| 37bb5d7 | René Scharfe | 22 November 2009, 16:15:29 UTC | strbuf_add_wrapped_text(): factor out strbuf_add_indented_text() Add a new helper function, strbuf_add_indented_text(), to indent text without a width limit, and call it from strbuf_add_wrapped_text(). It respects both indent (applied to the first line) and indent2 (applied to the rest of the lines); indent2 was ignored by the indent-only path of strbuf_add_wrapped_text() before the patch. Two simple test cases are added, one exercising strbuf_add_wrapped_text() and the other strbuf_add_indented_text(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:22:02 UTC |
| b482759 | René Scharfe | 22 November 2009, 15:58:09 UTC | grep: unset GREP_OPTIONS before spawning external grep While we're at it, also unset GREP_COLOR and GREP_COLORS in case colouring is not enabled, to be on the safe side. The presence of these variables alone is not sufficient to trigger coloured output with GNU grep, but other implementations may behave differently. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:20:59 UTC |
| 73a1d05 | Björn Gustavsson | 22 November 2009, 09:47:04 UTC | User Manual: Write "Git" instead of "GIT" In the Table of Contents, there is a notable inconsistency: first there is "GIT Glossary", followed by "Git Quick Reference" on the very next line. Running "grep -c" on user-manual.txt, I find 780 occurrrences of "git", 37 occurrences of "Git", and 9 occurrences of "GIT". In general, "git" is the preferred spelling, except at the beginning of a sentence. Therefore, change "GIT Glossary" to "Git Glossary" for consistency with the rest of the document. Looking at the other eight occurrences of "GIT" I found one other occurrence that should be changed: * The mention of "StGIT". Looking at the web pages for "Stacked Git" at http://www.procode.org/stgit, I only saw the spelling "StGit", except in http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT_Tutorial, but that page was last updated in 2006. The other seven occurrences should not be changed: * Three occurrences were in the output of 'git show-branch' run on the git.git repository. * One occurrence was in the output of 'git cat-file'. * One occurrence was as part of the file name "GIT-VERSION-GEN". * Two occurrences were in comments in scripts quoted in a description of Tony Luck's workflow. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:20:28 UTC |
| 625a860 | Björn Gustavsson | 22 November 2009, 21:19:53 UTC | Fix truncated usage messages The usage messages for some commands (such as 'git diff-tree') are truncated because they don't fit in a fixed buffer of 1024 bytes. It would be tempting to eliminate the buffer and the problem once and for all by doing the output in three steps, but doing so could (according to commit d048a96e) increase the likelyhood of messing up the display. So we just increase the size of the buffer. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:14:48 UTC |
| 4d0157d | Eric Wong | 22 November 2009, 20:37:06 UTC | git svn: always reuse existing remotes on fetch The internal no_reuse_existing flag is set to allow initializing multiple remotes with the same URL, common with SVM users. Unfortunately, this flag caused misbehavior when used with the -R command-line flag for fetching. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 22 November 2009, 20:54:59 UTC |
| 0f7fb21 | Junio C Hamano | 21 November 2009, 08:37:26 UTC | Documentation: avoid xmlto input error Do not write literal "~/" or "~user" but use "{tilde}/" and "{tilde}user"; otherwise the text between them gets enclosed in "<subscript>...</subscript>". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 08:37:26 UTC |
| 39add7a | Junio C Hamano | 21 November 2009, 07:55:50 UTC | Merge branch 'jc/fix-tree-walk' (early part) * 'jc/fix-tree-walk' (early part): unpack_callback(): use unpack_failed() consistently unpack-trees: typofix diff-lib.c: fix misleading comments on oneway_diff() | 21 November 2009, 07:55:50 UTC |
| 885d492 | Junio C Hamano | 21 November 2009, 07:53:55 UTC | Merge branch 'jh/notes' (early part) * 'jh/notes' (early part): Add selftests verifying concatenation of multiple notes for the same commit Refactor notes code to concatenate multiple notes annotating the same object Add selftests verifying that we can parse notes trees with various fanouts Teach the notes lookup code to parse notes trees with various fanout schemes Teach notes code to free its internal data structures on request Add '%N'-format for pretty-printing commit notes Add flags to get_commit_notes() to control the format of the note string t3302-notes-index-expensive: Speed up create_repo() fast-import: Add support for importing commit notes Teach "-m <msg>" and "-F <file>" to "git notes edit" Add an expensive test for git-notes Speed up git notes lookup Add a script to edit/inspect notes Introduce commit notes Conflicts: .gitignore Documentation/pretty-formats.txt pretty.c | 21 November 2009, 07:53:55 UTC |
| 905bf77 | Junio C Hamano | 21 November 2009, 07:51:23 UTC | Merge branch 'sp/smart-http' * sp/smart-http: (37 commits) http-backend: Let gcc check the format of more printf-type functions. http-backend: Fix access beyond end of string. http-backend: Fix bad treatment of uintmax_t in Content-Length t5551-http-fetch: Work around broken Accept header in libcurl t5551-http-fetch: Work around some libcurl versions http-backend: Protect GIT_PROJECT_ROOT from /../ requests Git-aware CGI to provide dumb HTTP transport http-backend: Test configuration options http-backend: Use http.getanyfile to disable dumb HTTP serving test smart http fetch and push http tests: use /dumb/ URL prefix set httpd port before sourcing lib-httpd t5540-http-push: remove redundant fetches Smart HTTP fetch: gzip requests Smart fetch over HTTP: client side Smart push over HTTP: client side Discover refs via smart HTTP server when available http-backend: more explict LocationMatch http-backend: add example for gitweb on same URL http-backend: use mod_alias instead of mod_rewrite ... Conflicts: .gitignore remote-curl.c | 21 November 2009, 07:51:23 UTC |
| 7dacc6c | Junio C Hamano | 21 November 2009, 07:48:57 UTC | Merge branch 'bw/autoconf-more' * bw/autoconf-more: configure: add settings for gitconfig, editor and pager configure: add macro to set arbitrary make variables | 21 November 2009, 07:48:57 UTC |
| 376f39f | Junio C Hamano | 21 November 2009, 07:48:52 UTC | Merge branch 'jn/editor-pager' * jn/editor-pager: Provide a build time default-pager setting Provide a build time default-editor setting am -i, git-svn: use "git var GIT_PAGER" add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR" Teach git var about GIT_PAGER Teach git var about GIT_EDITOR Suppress warnings from "git var -l" Do not use VISUAL editor on dumb terminals Handle more shell metacharacters in editor names | 21 November 2009, 07:48:52 UTC |
| 7a4383c | Junio C Hamano | 21 November 2009, 07:48:11 UTC | Merge branch 'rj/cygwin-msvc' * rj/cygwin-msvc: MSVC: Add support for building with NO_MMAP Makefile: keep MSVC and Cygwin configuration separate | 21 November 2009, 07:48:11 UTC |
| 8102453 | Junio C Hamano | 21 November 2009, 07:47:43 UTC | Merge branch 'rj/maint-simplify-cygwin-makefile' * rj/maint-simplify-cygwin-makefile: Makefile: merge two Cygwin configuration sections into one | 21 November 2009, 07:47:43 UTC |
| 1a02a85 | Junio C Hamano | 21 November 2009, 07:47:10 UTC | Merge branch 'bg/format-patch-doc-update' * bg/format-patch-doc-update: format-patch: Add "--no-stat" as a synonym for "-p" format-patch documentation: Fix formatting format-patch documentation: Remove diff options that are not useful format-patch: Always generate a patch | 21 November 2009, 07:47:10 UTC |
| aa43779 | Junio C Hamano | 21 November 2009, 07:46:14 UTC | Merge branch 'tr/filter-branch' * tr/filter-branch: filter-branch: nearest-ancestor rewriting outside subdir filter filter-branch: stop special-casing $filter_subdir argument | 21 November 2009, 07:46:14 UTC |
| 1973b23 | Junio C Hamano | 21 November 2009, 07:46:12 UTC | Merge branch 'sc/protocol-doc' * sc/protocol-doc: Update packfile transfer protocol documentation | 21 November 2009, 07:46:12 UTC |
| 6a09ff1 | Junio C Hamano | 21 November 2009, 07:46:07 UTC | Merge branch 'jl/submodule-add-noname' * jl/submodule-add-noname: git submodule add: make the <path> parameter optional | 21 November 2009, 07:46:07 UTC |
| 3fa95ce | Junio C Hamano | 21 November 2009, 07:46:03 UTC | Merge branch 'sb/ls-tree-parseopt' * sb/ls-tree-parseopt: ls-tree: migrate to parse-options t3101: test more ls-tree options | 21 November 2009, 07:46:03 UTC |
| ef6a243 | Junio C Hamano | 21 November 2009, 07:45:49 UTC | Merge branch 'rg/doc-workflow' * rg/doc-workflow: Add branch management for releases to gitworkflows | 21 November 2009, 07:45:49 UTC |
| 375fe92 | Junio C Hamano | 21 November 2009, 07:45:39 UTC | Merge branch 'jn/gitweb-log-history' * jn/gitweb-log-history: gitweb: Make 'history' view (re)use git_log_generic() gitweb: Refactor common parts of 'log' and 'shortlog' views gitweb: Refactor 'log' action generation, adding git_log_body() | 21 November 2009, 07:45:39 UTC |
| 750054c | Junio C Hamano | 21 November 2009, 07:44:52 UTC | Merge branch 'jn/help-everywhere' * jn/help-everywhere: (23 commits) diff --no-index: make the usage string less scary merge-{recursive,subtree}: use usagef() to print usage Introduce usagef() that takes a printf-style format Let 'git <command> -h' show usage without a git dir Show usage string for 'git http-push -h' Let 'git http-fetch -h' show usage outside any git repository Show usage string for 'git stripspace -h' Show usage string for 'git unpack-file -h' Show usage string for 'git show-index -h' Show usage string for 'git rev-parse -h' Show usage string for 'git merge-one-file -h' Show usage string for 'git mailsplit -h' Show usage string for 'git imap-send -h' Show usage string for 'git get-tar-commit-id -h' Show usage string for 'git fast-import -h' Show usage string for 'git check-ref-format -h' http-fetch: add missing initialization of argv0_path Show usage string for 'git show-ref -h' Show usage string for 'git merge-ours -h' Show usage string for 'git commit-tree -h' ... Conflicts: imap-send.c | 21 November 2009, 07:44:52 UTC |
| 1b8dbdb | Junio C Hamano | 21 November 2009, 07:44:35 UTC | Merge branch 'jp/fetch-cull-many-refs' * jp/fetch-cull-many-refs: remote: fix use-after-free error detected by glibc in ref_remove_duplicates fetch: Speed up fetch of large numbers of refs remote: Make ref_remove_duplicates faster for large numbers of refs | 21 November 2009, 07:44:35 UTC |
| 382e543 | Raman Gupta | 12 November 2009, 19:46:04 UTC | Add branch management for releases to gitworkflows The current man page does a reasonable job at describing branch management during the development process, but it does not contain any guidance as to how the branches are affected by releases. Add a basic introduction to the branch management undertaken during a git.git release, so that a reader may gain some insight into how the integration, maintenance, and topic branches are affected during the release transition, and is thus able to better design the process for their own project. Other release activities such as reviews, testing, and creating distributions are currently out of scope. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 07:39:58 UTC |
| d25e515 | Lukas Sandström | 20 November 2009, 16:12:47 UTC | git am/mailinfo: Don't look at in-body headers when rebasing When we are rebasing we know that the header lines in the patch are good and that we don't need to pick up any headers from the body of the patch. This makes it possible to rebase commits whose commit message start with "From" or "Date". Test vectors by Jeff King. Signed-off-by: Lukas Sandström <luksan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 07:14:02 UTC |
| 4504107 | Tim Henigan | 20 November 2009, 23:43:13 UTC | git remote: Separate usage strings for subcommands When the usage string for a subcommand must be printed, only print the information relevant to that command. This commit also removes the complete options list from the first line of the subcommand usage string. Instead, individual options are documented in the detailed description following the general usage line. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 06:15:30 UTC |
| 809809b | Junio C Hamano | 21 November 2009, 06:13:47 UTC | diffcore-rename: reduce memory footprint by freeing blob data early After running one round of estimate_similarity(), filespecs on either side will have populated their cnt_data fields, and we do not need the blob text anymore. We used to retain the blob data to optimize for smaller projects (not freeing the blob data here would mean that the final output phase would not have to re-read it), but we are efficient enough without such optimization for smaller projects anyway, and freeing memory early will help larger projects. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 06:13:47 UTC |
| 7a0d61b | Thomas Rast | 18 November 2009, 13:32:26 UTC | describe: do not use unannotated tag even if exact match 4d23660 (describe: when failing, tell the user about options that work, 2009-10-28) forgot to update the shortcut path where the code detected and used a possible exact match. This means that an unannotated tag on HEAD would be used by 'git describe'. Guard this code path against the new circumstances, where unannotated tags can be present in ->util even if we're not actually planning to use them. While there, also add some tests for --all. Reported by 'yashi' on IRC. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 05:58:11 UTC |
| 75b9a8a | David Aguilar | 20 November 2009, 11:33:53 UTC | submodule.c: Squelch a "use before assignment" warning i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493) compiler (and probably others) mistakenly thinks variable 'right' is used before assigned. Work around it by giving it a fake initialization. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 05:58:11 UTC |
| aa8dc96 | Greg Price | 19 November 2009, 20:58:29 UTC | Documentation: undocument gc'd function graph_release() graph_release() was removed in 064bfbd. Cut it from the API documentation and a comment. Signed-off-by: Greg Price <price@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2009, 07:05:17 UTC |
| 81f4026 | Ramsay Jones | 19 November 2009, 18:41:20 UTC | t9700-perl-git.sh: Fix a test failure on Cygwin The t/t9700/test.pl script uses method invocation syntax when using the Cwd module to determine the current working directory. This fails on cygwin, since cygwin perl specifically checks for any arguments to the cwd() function and croak()'s with the message "Usage: Cwd::cwd()". (In perl v5.8.8 distribution, see the file perl-5.8.8/cygwin/cygwin.c lines 139-157) In order to avoid the problem, we replace the method invocation syntax with a simple function call. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2009, 07:01:09 UTC |
| df2a79f | Matthieu Moy | 19 November 2009, 15:21:15 UTC | expand_user_path: expand ~ to $HOME, not to the actual homedir. In 395de250d (Expand ~ and ~user in core.excludesfile, commit.template), we introduced the mechanism. But expanding ~ using getpw is not what people overriding $HOME would usually expect. In particular, git looks for the user's .gitconfig using $HOME, so it's better to be consistent. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 November 2009, 18:01:12 UTC |
| e36e6c0 | Junio C Hamano | 18 November 2009, 06:03:20 UTC | Merge branch 'np/maint-sideband-favor-status' * np/maint-sideband-favor-status: give priority to progress messages | 18 November 2009, 06:03:20 UTC |
| aa17bac | Junio C Hamano | 18 November 2009, 06:03:02 UTC | Merge branch 'sb/tutorial-test' * sb/tutorial-test: t1200: prepare for merging with Fast-forward bikeshedding t1200: further modernize test script style t1200: Make documentation and test agree t1200: cleanup and modernize test style | 18 November 2009, 06:03:02 UTC |
| a62e733 | Junio C Hamano | 18 November 2009, 06:03:00 UTC | Merge branch 'ef/msys-imap' * ef/msys-imap: Windows: use BLK_SHA1 again MSVC: Enable OpenSSL, and translate -lcrypto mingw: enable OpenSSL mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle imap-send: build imap-send on Windows imap-send: fix compilation-error on Windows imap-send: use run-command API for tunneling imap-send: use separate read and write fds imap-send: remove useless uid code | 18 November 2009, 06:03:00 UTC |
| 61fdbcf | Stephen Boyd | 14 November 2009, 04:34:08 UTC | ls-tree: migrate to parse-options Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2009, 05:58:12 UTC |
| 395de25 | Matthieu Moy | 17 November 2009, 17:24:25 UTC | Expand ~ and ~user in core.excludesfile, commit.template These config variables are parsed to substitute ~ and ~user with getpw entries. user_path() refactored into new function expand_user_path(), to allow dynamically allocating the return buffer. Original patch by Karl Chen, modified by Matthieu Moy, and further amended by Junio C Hamano. Signed-off-by: Karl Chen <quarl@quarl.org> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2009, 05:53:11 UTC |
| eaa4e6e | Jonathan Nieder | 18 November 2009, 00:49:10 UTC | Speed up bash completion loading Since git is not used in each and every interactive xterm, it seems best to load completion support with cold caches and then load each needed thing lazily. This has most of the speed advantage of pre-generating everything at build time, without the complication of figuring out at build time what commands will be available at run time. On this slow laptop, this decreases the time to load git-completion.bash from about 500 ms to about 175 ms. Suggested-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Shawn O. Pearce <spearce@spearce.org> Cc: Stephen Boyd <bebarino@gmail.com> Cc: SZEDER Gábor <szeder@ira.uka.de> Cc: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2009, 05:35:15 UTC |
| 643faee | Junio C Hamano | 17 November 2009, 16:59:27 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: Document git-svn's first-parent rule git svn: attempt to create empty dirs on clone+rebase git svn: add authorsfile test case for ~/.gitconfig git svn: read global+system config for clone+init git svn: handle SVN merges from revisions past the tip of the branch | 17 November 2009, 16:59:27 UTC |
| be38ca3 | Philippe Bruhat (BooK) | 17 November 2009, 08:42:39 UTC | Make sure $PERL_PATH is defined when the test suite is run. Some test scripts run Perl scripts as if they were git-* scripts, and thus need to use the same perl that will be put in the shebang line of git*.perl commands. $PERL_PATH therefore needs to be used instead of a bare "perl". The tests can fail if another perl is found in $PATH before the one defined in $PERL_PATH. Example test failure caused by this: the perl defined in $PERL_PATH has Error.pm installed, and therefore the Git.pm's Makefile.PL doesn't install the private copy. The perl from $PATH doesn't have Error.pm installed, and all git*.perl scripts invoked during the test will fail loading Error.pm. Makefile patch by Jeff King <peff@peff.net>. Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 16:37:03 UTC |
| ce45a45 | Thomas Rast | 16 November 2009, 10:15:17 UTC | Document git-svn's first-parent rule git-svn has the following rule to detect the SVN base for its operations: find the first git-svn-id line reachable through first-parent ancestry. IOW, git log --grep=^git-svn-id: --first-parent -1 Document this, as it is very important when using merges with git-svn. Signed-off-by: Thomas Rast <trast@student.ethz.ch> | 17 November 2009, 07:33:58 UTC |
| ff68668 | Matthew Ogilvie | 14 November 2009, 18:35:00 UTC | core.autocrlf documentation: mention the crlf attribute The description of the configuration variable is obsolete and wrong (saying only file content is used), not just incomplete. It has used the attribute mechanism for a long time. The documentation of gitattributes mentions the core.autocrlf configuration variable in its description of crlf attribute. Refer to the gitattributes documentation from here as well. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 06:32:05 UTC |
| 31ddd1e | Thomas Rast | 15 November 2009, 18:25:31 UTC | rebase docs: clarify --merge and --strategy Add a paragraph about the swapped sides in a --merge rebase, which was otherwise only documented in the sources. Add a paragraph about the effects of the 'ours' strategy to the -s description. Also remove the mention of the 'octopus' strategy, which was copied from the git-merge description but is pointless in a rebase. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 06:10:34 UTC |
| 3ea6025 | Stephen Boyd | 14 November 2009, 04:34:07 UTC | t3101: test more ls-tree options Add tests for --full-name, --full-tree, --abbrev, and --name-only. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 05:35:26 UTC |
| 5183bf6 | Brian Collins | 06 November 2009, 09:22:35 UTC | grep: Allow case insensitive search of fixed-strings "git grep" currently an error when you combine the -F and -i flags. This isn't in line with how GNU grep handles it. This patch allows the simultaneous use of those flags. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Brian Collins <bricollins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 00:06:46 UTC |
| 8282de9 | Jeff King | 16 November 2009, 16:02:02 UTC | diffcore-break: save cnt_data for other phases The "break" phase works by counting changes between two blobs with the same path. We do this by splitting the file into chunks (or lines for text oriented files) and then keeping a count of chunk hashes. The "rename" phase counts changes between blobs at two different paths. However, it uses the exact same set of chunk hashes (which are immutable for a given sha1). The rename phase can therefore use the same hash data as break. Unfortunately, we were throwing this data away after computing it in the break phase. This patch instead attaches it to the filespec and lets it live through the rename phase, working under the assumption that most of the time that breaks are being computed, renames will be too. We only do this optimization for files which have actually been broken, as those ones will be candidates for rename detection (and it is a time-space tradeoff, so we don't want to waste space keeping useless data). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 21:21:12 UTC |
| f4f19fb | Jeff King | 16 November 2009, 15:56:25 UTC | diffcore-break: free filespec data as we go As we look at each changed file and consider breaking it, we load the blob data and make a decision about whether to break, which is independent of any other blobs that might have changed. However, we keep the data in memory while we consider breaking all of the other files. Which means that both versions of every file you are diffing are in memory at the same time. This patch instead frees the blob data as we finish with each file pair, leading to much lower memory usage. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 21:21:11 UTC |
| 785c58e | Junio C Hamano | 16 November 2009, 08:07:48 UTC | Update draft release notes to 1.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 08:07:48 UTC |
| 78e0dbe | Junio C Hamano | 16 November 2009, 08:06:23 UTC | Sync with 1.6.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 08:06:30 UTC |
| 080cbc1 | Junio C Hamano | 16 November 2009, 08:05:12 UTC | Git 1.6.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 08:05:12 UTC |
| c6b53c8 | Junio C Hamano | 16 November 2009, 08:03:15 UTC | Merge branch 'bs/maint-pre-commit-hook-sample' into maint * bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid | 16 November 2009, 08:03:15 UTC |
| 5e9cb86 | Junio C Hamano | 16 November 2009, 08:02:44 UTC | Merge branch 'jk/maint-add-p-empty' into maint * jk/maint-add-p-empty: add-interactive: handle deletion of empty files | 16 November 2009, 08:02:44 UTC |
| d404a3e | Junio C Hamano | 16 November 2009, 08:01:56 UTC | Merge branch 'js/maint-diff-color-words' into maint * js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c | 16 November 2009, 08:01:56 UTC |
| ee16339 | Junio C Hamano | 16 November 2009, 07:08:42 UTC | Merge branch 'tz/maint-rpm' into maint * tz/maint-rpm: Makefile: Ensure rpm packages can be read by older rpm versions | 16 November 2009, 07:08:42 UTC |
| 1f9d282 | Junio C Hamano | 16 November 2009, 07:07:49 UTC | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint * jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat | 16 November 2009, 07:07:49 UTC |
| 3ad1243 | Junio C Hamano | 16 November 2009, 07:07:38 UTC | Merge branch 'pb/maint-gitweb-blob-lineno' into maint * pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode | 16 November 2009, 07:07:38 UTC |
| 958742b | Junio C Hamano | 16 November 2009, 07:07:32 UTC | Merge branch 'jk/maint-1.6.3-ls-files-i' into maint * jk/maint-1.6.3-ls-files-i: ls-files: unbreak "ls-files -i" | 16 November 2009, 07:07:32 UTC |
| 3e606ea | Junio C Hamano | 16 November 2009, 07:07:27 UTC | Merge branch 'vl/maint-openssl-signature-change' into maint * vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0 | 16 November 2009, 07:07:27 UTC |
| 8d324bf | Junio C Hamano | 16 November 2009, 07:07:17 UTC | Merge branch 'jk/maint-push-config' into maint * jk/maint-push-config: push: always load default config | 16 November 2009, 07:07:17 UTC |
| 061c4d0 | Junio C Hamano | 16 November 2009, 07:07:07 UTC | Merge branch 'sr/blame-incomplete' into maint * sr/blame-incomplete: blame: make sure that the last line ends in an LF | 16 November 2009, 07:07:07 UTC |
| 6dbdba0 | Junio C Hamano | 16 November 2009, 07:06:34 UTC | Merge branch 'jc/maint-blank-at-eof' into maint * jc/maint-blank-at-eof: diff -B: colour whitespace errors diff.c: emit_add_line() takes only the rest of the line diff.c: split emit_line() from the first char and the rest of the line diff.c: shuffling code around diff --whitespace: fix blank lines at end core.whitespace: split trailing-space into blank-at-{eol,eof} diff --color: color blank-at-eof diff --whitespace=warn/error: fix blank-at-eof check diff --whitespace=warn/error: obey blank-at-eof diff.c: the builtin_diff() deals with only two-file comparison apply --whitespace: warn blank but not necessarily empty lines at EOF apply --whitespace=warn/error: diagnose blank at EOF apply.c: split check_whitespace() into two apply --whitespace=fix: detect new blank lines at eof correctly apply --whitespace=fix: fix handling of blank lines at the eof | 16 November 2009, 07:06:34 UTC |
| 3548701 | Tarmigan Casebolt | 14 November 2009, 21:10:58 UTC | http-backend: Let gcc check the format of more printf-type functions. We already have these checks in many printf-type functions that have prototypes which are in header files. Add these same checks to static functions in http-backend.c Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 06:15:01 UTC |
| 48aec1b | Tarmigan Casebolt | 14 November 2009, 21:10:57 UTC | http-backend: Fix access beyond end of string. Found with valgrind while looking for Content-Length corruption in smart http. Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 06:14:51 UTC |
| 6111b93 | Eric Wong | 16 November 2009, 02:57:16 UTC | git svn: attempt to create empty dirs on clone+rebase We parse unhandled.log files for empty_dir statements and make a best effort attempt to recreate empty directories on fresh clones and rebase. This should cover the majority of cases where users work off a single branch or for projects where branches do not differ in empty directories. Since this cannot affect "normal" git commands like "checkout" or "reset", so users switching between branches in a single working directory should use the new "git svn mkdirs" command after switching branches. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 16 November 2009, 03:30:06 UTC |
| 28bea9e | Tarmigan Casebolt | 14 November 2009, 21:33:13 UTC | Check the format of more printf-type functions We already have these checks in many printf-type functions that have prototypes which are in header files. Add these same checks to some more prototypes in header functions and to static functions in .c files. cc: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 02:24:58 UTC |
| 77097fa | Junio C Hamano | 16 November 2009, 00:41:42 UTC | Merge branch 'maint' * maint: | 16 November 2009, 00:41:42 UTC |
| 2dfb96c | Junio C Hamano | 16 November 2009, 00:41:33 UTC | Merge branch 'bs/maint-pre-commit-hook-sample' * bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid | 16 November 2009, 00:41:33 UTC |
| 002a9ec | Junio C Hamano | 16 November 2009, 00:41:29 UTC | Merge branch 'js/maint-diff-color-words' * js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c | 16 November 2009, 00:41:29 UTC |
| 934c042 | Junio C Hamano | 16 November 2009, 00:41:17 UTC | Merge branch 'rs/pretty-wrap' * rs/pretty-wrap: log --format: don't ignore %w() at the start of format string Implement wrap format %w() as if it is a mode switch Conflicts: pretty.c | 16 November 2009, 00:41:17 UTC |
| 7ef705e | Junio C Hamano | 16 November 2009, 00:41:07 UTC | Merge branch 'js/log-rewrap' * js/log-rewrap: Teach --wrap to only indent without wrapping Add strbuf_add_wrapped_text() to utf8.[ch] print_wrapped_text(): allow hard newlines | 16 November 2009, 00:41:07 UTC |
| 4d8c325 | Junio C Hamano | 16 November 2009, 00:41:02 UTC | Merge branch 'fc/doc-fast-forward' * fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c | 16 November 2009, 00:41:02 UTC |
| 9fa51ff | Junio C Hamano | 16 November 2009, 00:40:50 UTC | Merge branch 'sc/difftool-p4merge' * sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option | 16 November 2009, 00:40:50 UTC |
| 3176bd0 | Junio C Hamano | 16 November 2009, 00:40:46 UTC | Merge branch 'jk/maint-add-p-empty' * jk/maint-add-p-empty: add-interactive: handle deletion of empty files | 16 November 2009, 00:40:46 UTC |
| 578e5ef | Junio C Hamano | 16 November 2009, 00:40:39 UTC | Merge branch 'lt/revision-bisect' * lt/revision-bisect: Add '--bisect' revision machinery argument | 16 November 2009, 00:40:39 UTC |
| dd2195e | Junio C Hamano | 16 November 2009, 00:38:47 UTC | Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint * jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line | 16 November 2009, 00:38:47 UTC |
| 69abb19 | Junio C Hamano | 16 November 2009, 00:38:36 UTC | Merge branch 'tr/maint-roff-quote' into maint * tr/maint-roff-quote: Quote ' as \(aq in manpages | 16 November 2009, 00:38:36 UTC |
| f411c43 | Junio C Hamano | 16 November 2009, 00:38:18 UTC | Merge branch 'ja/fetch-doc' into maint * ja/fetch-doc: Documentation/merge-options.txt: order options in alphabetical groups Documentation/git-pull.txt: Add subtitles above included option files Documentation/fetch-options.txt: order options alphabetically | 16 November 2009, 00:38:18 UTC |
| 077f3d4 | Junio C Hamano | 16 November 2009, 00:37:58 UTC | Merge branch 'cb/doc-fetch-pull-merge' into maint * cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples | 16 November 2009, 00:37:58 UTC |
| 04b3577 | Junio C Hamano | 16 November 2009, 00:37:53 UTC | Merge branch 'jk/maint-cvsimport-pathname' into maint * jk/maint-cvsimport-pathname: cvsimport: fix relative argument filenames | 16 November 2009, 00:37:53 UTC |
| a25a2cd | Junio C Hamano | 16 November 2009, 00:37:49 UTC | Merge branch 'jc/receive-pack-auto' into maint * jc/receive-pack-auto: receive-pack: run "gc --auto --quiet" and optionally "update-server-info" gc --auto --quiet: make the notice a bit less verboase | 16 November 2009, 00:37:49 UTC |
| 14d52b2 | Junio C Hamano | 16 November 2009, 00:37:39 UTC | Merge branch 'gb/maint-gitweb-esc-param' into maint * gb/maint-gitweb-esc-param: gitweb: fix esc_param | 16 November 2009, 00:37:39 UTC |
| 9453f8a | Junio C Hamano | 16 November 2009, 00:37:36 UTC | Merge branch 'jn/gitweb-patch' into maint * jn/gitweb-patch: gitweb: Do not show 'patch' link for merge commits | 16 November 2009, 00:37:36 UTC |
| d4cbaa1 | Thomas Rast | 15 November 2009, 18:25:30 UTC | Documentation: clarify 'ours' merge strategy Make it clear in the docs that the merge takes the tree of HEAD and ignores everything in the other branches. This should hopefully clear up confusion, usually caused by the user looking for a strategy that resolves all conflict hunks in favour of HEAD (which is completely different and currently not supported). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 November 2009, 20:26:08 UTC |
| 997c2a4 | Tim Henigan | 15 November 2009, 19:46:25 UTC | Update 'git remote update' usage string to match man page. Commit b344e161 taught 'git remote update' to understand [group | remote] as its argument. The man page was updated to document this change, but the usage string was not. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 November 2009, 20:24:46 UTC |
