| d7e522c | Jeff King | 16 December 2007, 07:21:04 UTC | rename git-browse--help to git-help--browse The convention for helper scripts has been git-$TOOL--$HELPER. Since this is a "browse" helper for the "help" tool, git-help--browse is a more sensible name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 20:52:40 UTC |
| 6ba7823 | 李鸿 | 16 December 2007, 04:53:26 UTC | Fix a memory leak Signed-off-by: Li Hong <leehong@pku.edu.cn> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 20:50:08 UTC |
| bc8b95a | Petr Baudis | 08 December 2007, 11:30:59 UTC | gitweb: Make config_to_multi return [] instead of [undef] This is important for the list of clone urls, where if there are no per-repository clone URL configured, the default base URLs are never used for URL construction without this patch. Add tests for different ways of setting project URLs, just in case. Note that those tests in current form wouldn't detect breakage fixed by this patch, as it only checks for errors and not for expected output. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:27 UTC |
| dfa7c7d | Jakub Narebski | 15 December 2007, 14:41:49 UTC | gitweb: Teach "a=blob" action to be more lenient about blob/file mime type Since 930cf7dd7cc6b87d173f182230763e1f1913d319 'blob' action knows the file type; if the file type is not "text/*" or one of common network image formats/mimetypes (gif, png, jpeg) then the action "blob" defaulted to "blob_plain". This caused the problem if mimetypes file was not well suited for web, for example returning "application/x-sh" for "*.sh" shell scripts, instead of "text/plain" (or other "text/*"). Now "blob" action defaults to "blob_plain" ('raw' view) only if file is of type which is neither "text/*" nor "image/{gif,png,jpeg}" AND it is binary file. Otherwise it assumes that it can be displayed either in <img> tag ("image/*" mimetype), or can be displayed line by line (otherwise). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:26 UTC |
| bf901f8 | Jakub Narebski | 15 December 2007, 14:40:28 UTC | gitweb: disambiguate heads and tags withs the same name Avoid wrong disambiguation that would link logs/trees of tags and heads which share the same name to the same page, leading to a disambiguation that would prefer the tag, thus making it impossible to access the corresponding head log and tree without hacking the url by hand. It does it by using full refname (with 'refs/heads/' or 'refs/tags/' prefix) instead of shortened one in the URLs in 'heads' and 'tags' tables. This makes URLs (and refs) provided by gitweb unambiguous. Signed-off-by: Guillaume Seguin <guillaume@segu.in> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:56:26 UTC |
| 718a087 | Jeff King | 15 December 2007, 11:11:54 UTC | teach bash completion to treat commands with "--" as a helper There is a convention that commands containing a double-dash are implementation details and not to be used by mortals. We should automatically remove them from the completion suggestions as such. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:55:48 UTC |
| 5249997 | Jeff King | 16 December 2007, 07:06:14 UTC | trim_common_tail: brown paper bag fix. The recovered context lines were not LF terminated due to off-by-one error, which also caused the outer loop to count the number of recovered lines to terminate after running only once. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2007, 19:53:03 UTC |
| 7680087 | Junio C Hamano | 15 December 2007, 06:30:38 UTC | Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:30:38 UTC |
| 530e741 | Junio C Hamano | 25 November 2007, 07:48:04 UTC | Start preparing the API documents. Most of them are still stubs, but the procedure to build the HTML documentation, maintaining the index and installing the end product are there. I placed names of people who are likely to know the most about the topic in the stub files, so that volunteers will know whom to ask questions as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:29:38 UTC |
| fa47016 | Junio C Hamano | 15 December 2007, 06:08:25 UTC | Retire git-runstatus for real. The command was removed from the builtin command list and there was no way to invoke it, but the code was still there. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:08:25 UTC |
| 5b4617c | Junio C Hamano | 15 December 2007, 06:02:57 UTC | Rename git-browse-help helper to git-browse--help Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 06:04:43 UTC |
| 70087cd | Christian Couder | 15 December 2007, 04:57:28 UTC | git-help: add "help.format" config variable. This config variable makes it possible to choose the default format used to display help. This format will be used only if no option like -a|--all|-i|--info|-m|--man|-w|--web is passed to "git-help". The following values are possible for this variable: - "man" --> "man" program is used - "info" --> "info" program is used - "web" --> "git-browse-help" is used By default we still show help using "man". This patch also adds -m|--man command line option to use "man" to allow overriding the "help.format" configuration variable. Note that this patch also revert some recent changes in "git-browse-help" because they prevented to look for config variables in the global configuration file. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:58:35 UTC |
| dfaf75b | Junio C Hamano | 15 December 2007, 05:42:53 UTC | Merge branch 'wc/diff' * wc/diff: Test interaction between diff --check and --exit-code Use shorter error messages for whitespace problems Add tests for "git diff --check" with core.whitespace options Make "diff --check" output match "git apply" Unify whitespace checking diff --check: minor fixups "diff --check" should affect exit status | 15 December 2007, 05:42:53 UTC |
| d7e9280 | Mike Hommey | 10 December 2007, 23:08:25 UTC | Move fetch_ref from http-push.c and http-walker.c to http.c Make the necessary changes to be ok with their difference, and rename the function http_fetch_ref. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 3a462bc | Mike Hommey | 10 December 2007, 21:36:11 UTC | Fix various memory leaks in http-push.c and http-walker.c Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 028c297 | Mike Hommey | 09 December 2007, 19:30:59 UTC | Use strbuf in http code Also, replace whitespaces with tabs in some places Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| e8dc37e | Mike Hommey | 10 December 2007, 21:36:09 UTC | Avoid redundant declaration of missing_target() Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 02dc534 | Mike Hommey | 10 December 2007, 21:36:08 UTC | Remove a CURLOPT_HTTPHEADER (un)setting Setting CURLOPT_HTTPHEADER doesn't add HTTP headers, but replaces whatever set of headers was configured before, so setting to NULL doesn't have any magic meaning, and is pretty much useless when setting to another list right after. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| c20f290 | Mike Hommey | 10 December 2007, 21:36:07 UTC | Remove the default_headers variable from http-push.c It appears that despite being initialized, it was never used. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| a096bb1 | Mike Hommey | 14 December 2007, 21:18:01 UTC | Fix random sha1 in error message in http-fetch and http-push When a downloaded ref doesn't contain a sha1, the error message displays a random sha1 because of uninitialized memory. This happens when cloning a repository that is already a clone of another one, in which case refs/remotes/origin/HEAD is a symref. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:59 UTC |
| 3b683b9 | Mike Hommey | 14 December 2007, 21:18:00 UTC | Fix some more memory leaks in http-push.c Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 05:31:58 UTC |
| 5973a07 | Wincent Colaiuta | 14 December 2007, 11:23:44 UTC | Test interaction between diff --check and --exit-code Make sure that it works as advertised in the man page. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 04:52:26 UTC |
| 420f4f0 | Wincent Colaiuta | 14 December 2007, 11:23:43 UTC | Use shorter error messages for whitespace problems The initial version of the whitespace_error_string() function took the messages from builtin-apply.c rather than the shorter messages from diff.c. This commit addresses Junio's concern that these messages might be too long (now that we can emit multiple warnings per line). Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 04:51:58 UTC |
| cb891a5 | Kristian Høgsberg | 14 December 2007, 20:59:58 UTC | Use a strbuf for building up section header and key/value pair strings. Avoids horrible 1-byte write(2) calls and cleans up the logic a bit. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 04:42:26 UTC |
| 69ae517 | David S. Miller | 15 December 2007, 04:39:16 UTC | fast-import: fix unalinged allocation and access The specialized pool allocator fast-import uses aligned objects on the size of a pointer, which was not sufficient at least on Sparc. Instead, make the alignment for objects of type unitmax_t. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 04:39:16 UTC |
| 896c053 | Junio C Hamano | 15 December 2007, 04:34:56 UTC | remote: Fix bogus make_branch() call in configuration reader. The configuration reader to enumerate branches that have configuration data were not careful enough and failed to skip "branch.<variable>" entries (e.g. branch.autosetupmerge). This resulted in bogus attempt to allocate huge memory. Noticed by David Miller. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2007, 04:34:56 UTC |
| 1eb1e9e | Junio C Hamano | 14 December 2007, 19:57:22 UTC | commit: allow --amend to reuse message from another commit After tentatively applying a patch from a contributor, you can get a replacement patch with corrected code and unusable commit log message. In such a case, this sequence ought to give you an editor based on the message in the earlier commit, to let you describe an incremental improvement: git reset --hard HEAD^ ;# discard the earlier one git am <corrected-patch git commit --amend -c HEAD@{1} Unfortunately, --amend insisted reusing the message from the commit being amended, ignoring the -c option. This corrects it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 23:39:54 UTC |
| 12a6d75 | Eric Wong | 14 December 2007, 16:39:09 UTC | git-svn: handle our top-level path being deleted and later re-added Previously, git-svn would ignore cases where the path we're tracking is removed from the repository. This was to prevent heads with follow-parent from ending up with a tree full of empty revisions (and thus breaking rename detection). The previous behavior is fine until the path we're tracking is re-added later on, leading to the old files being merged in with the new files in the directory (because the old files were never marked as deleted) We will now only remove all the old files locally that were deleted remotely iff we detect the directory we're in is being created from scratch. Thanks for Marcus D. Hanwell for the bug report and Peter Baumann for the analysis. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 20:06:23 UTC |
| 38a5b1d | Jeff King | 14 December 2007, 09:15:47 UTC | cvsexportcommit: fix massive commits Because we feed the changed filenames to CVS on the command line, it was possible for massive commits to overflow the system exec limits. Instead, we now do an xargs-like split of the arguments. This means that we lose some of the atomicity of calling CVS in one shot. Since CVS commits are not atomic, but the CVS protocol is, the possible effects of this are not clear; however, since CVS doesn't provide a different interface, this is our only option for large commits (short of writing a CVS client library). The argument size limit is arbitrarily set to 64kB. This should be high enough to trigger only in rare cases where it is necessary, so normal-sized commits are not affected by the atomicity change. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 20:06:04 UTC |
| 71362bd | linux@horizon.com | 14 December 2007, 11:28:14 UTC | Documentation: describe pack idx v2 Lifted from the log message of c553ca25bd60dc9fd50b8bc7bd329601b81cee66 (pack-objects: learn about pack index version 2). Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 20:03:12 UTC |
| 29ab27f | Junio C Hamano | 14 December 2007, 20:00:42 UTC | xdiff tail trimming: use correct type. Inside xdiff library, the number of context lines is represented in long, not int. Noticed by Peter Baumann. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 20:00:42 UTC |
| f817546 | Wincent Colaiuta | 13 December 2007, 13:32:31 UTC | Add tests for "git diff --check" with core.whitespace options Make sure that "git diff --check" does the right thing when the core.whitespace options are set. While we are at it, correct many uses of test_expect_failure that ran sequence of commands. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:53:20 UTC |
| 45e2a4b | Wincent Colaiuta | 13 December 2007, 13:32:30 UTC | Make "diff --check" output match "git apply" For consistency, make the two tools report whitespace errors in the same way (the output of "diff --check" has been tweaked to match that of "git apply"). Note that although the textual content is basically the same only "git diff --check" provides a colorized version of the problematic lines; making "git apply" do colorization will require more extensive changes (figuring out the diff colorization preferences of the user) and so that will be a subject for another commit. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:43:58 UTC |
| c1795bb | Wincent Colaiuta | 13 December 2007, 13:32:29 UTC | Unify whitespace checking This commit unifies three separate places where whitespace checking was performed: - the whitespace checking previously done in builtin-apply.c is extracted into a function in ws.c - the equivalent logic in "git diff" is removed - the emit_line_with_ws() function is also removed because that also rechecks the whitespace, and its functionality is rolled into ws.c The new function is called check_and_emit_line() and it does two things: checks a line for whitespace errors and optionally emits it. The checking is based on lines of content rather than patch lines (in other words, the caller must strip the leading "+" or "-"); this was suggested by Junio on the mailing list to allow for a future extension to "git show" to display whitespace errors in blobs. At the same time we teach it to report all classes of whitespace errors found for a given line rather than reporting only the first found error. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:43:58 UTC |
| da31b35 | Junio C Hamano | 14 December 2007, 07:40:27 UTC | diff --check: minor fixups There is no reason --exit-code and --check-diff must be mutually exclusive, so assign different bits to different results and allow them to be returned from the command. Introduce diff_result_code() to factor out the common code to decide final status code based on diffopt settings and use it everywhere. Update tests to match the above fix. Turning pager off when "diff --check" is used is a regression. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:40:27 UTC |
| 62c6489 | Wincent Colaiuta | 13 December 2007, 20:24:52 UTC | "diff --check" should affect exit status "git diff" has a --check option that can be used to check for whitespace problems but it only reported by printing warnings to the console. Now when the --check option is used we give a non-zero exit status, making "git diff --check" nicer to use in scripts and hooks. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:05:42 UTC |
| 913b45f | Junio C Hamano | 13 December 2007, 22:24:18 UTC | xdi_diff: trim common trailing lines This implements earlier Linus's optimization to trim common lines at the end before passing them down to low level xdiff interface for all of our xdiff users. We could later enhance this to also trim common leading lines, but that would need tweaking the output function to add the number of lines trimmed at the beginning to line numbers that appear in the hunk headers. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:04:26 UTC |
| c279d7e | Junio C Hamano | 13 December 2007, 21:25:07 UTC | xdl_diff: identify call sites. This inserts a new function xdi_diff() that currently does not do anything other than calling the underlying xdl_diff() to the callchain of current callers of xdl_diff() function. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 07:04:26 UTC |
| 792c158 | Nicolas Pitre | 14 December 2007, 03:32:36 UTC | provide advance warning of some future pack default changes Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2007, 05:19:26 UTC |
| 3157dd9 | Eric Wong | 13 December 2007, 16:27:34 UTC | git-svn: unlink internal index files after operations Being git, we can generate these very quickly on the fly as needed, so there's no point in wasting space for these things for large projects. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 17:54:45 UTC |
| 5ff6aae | Andy Whitcroft | 13 December 2007, 06:58:15 UTC | git-svn: expand handling of From: and Signed-off-by: The current parsing for From: and Signed-off-by: lines handles fully specified names: From: Full Name <email@address> Expand this to include the raw email addresses and straight "names": From: email@address -> email <email@address> From: Full Name -> Full Name <unknown> Signed-off-by: Andy Whitcroft <apw@shadowen.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 17:47:48 UTC |
| 9e5d87d | Shawn Bohrer | 13 December 2007, 04:36:21 UTC | Fix spelling mistakes in user manual Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 17:46:52 UTC |
| 37d07f8 | Junio C Hamano | 13 December 2007, 03:09:16 UTC | git-commit: squelch needless message during an empty merge When recording a merge that conflicted and ends up in no changes after manual resolution, commit callchain looked like this: cmd_commit() -> prepare_log_message() -> run_status() -> wt_status_print() This invocation of run_status() is asked to find out if there is a committable change, but it unconditionally gave instructions such as "use git-add" at the same time. When in merge, we do allow an empty change to be recorded, so after showing this message the code still went ahead and made a commit. This introduces "nowarn" parameter to run_status() to avoid these useless messages. If we are not allowed to create an empty commit, we already call run_status() again in the original codepath, and the message will be shown from that call anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 04:50:33 UTC |
| 1e8df76 | Junio C Hamano | 13 December 2007, 01:48:21 UTC | GIT 1.5.4-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 01:48:21 UTC |
| 467f42c | Junio C Hamano | 13 December 2007, 01:46:16 UTC | Merge branch 'cc/help' * cc/help: RPM spec: Adjust htmldir git-help -w: do not require to be in git repository git.spec.in: remove python_path Documentation: rename git.texi to user-manual.texi Add git-browse-help to .gitignore git-help -i: show info documentation from matching version of git git-help -i: invoke info with document and node name Documentation: add gitman.info target Documentation: describe -w/--web option to "git-help". Use {web,instaweb,help}.browser config options. git-help: add -w|--web option to display html man page in a browser. Documentation: describe -i/--info option to "git-help" git-help: add -i|--info option to display info page. | 13 December 2007, 01:46:16 UTC |
| 39bf13f | Junio C Hamano | 12 December 2007, 22:00:24 UTC | RPM spec: Adjust htmldir git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 01:41:58 UTC |
| 22c9071 | Junio C Hamano | 13 December 2007, 01:34:30 UTC | git-help -w: do not require to be in git repository The users used to be able to say "git help cat-file" from anywhere, but the browse-help script insisted to be in a git repository, which caused "git help -w cat-file" to barf outside. Correct it. While at it, remove leftover debugging "echo". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2007, 01:41:58 UTC |
| cd1bea9 | Junio C Hamano | 13 December 2007, 01:07:03 UTC | Merge branch 'jc/shortlog-e' * jc/shortlog-e: shortlog: default to HEAD when the standard input is a tty Invert numbers and names in the git-shortlog summary mode. shortlog: document -e option git-shortlog -e: show e-mail address as well | 13 December 2007, 01:07:03 UTC |
| 3e5f260 | Junio C Hamano | 13 December 2007, 00:53:06 UTC | Merge branch 'ew/svn-rev-db' * ew/svn-rev-db: git-svn: reinstate old rev_db optimization in new rev_map git-svn: replace .rev_db with a more space-efficient .rev_map format | 13 December 2007, 00:53:06 UTC |
| d9cf4ec | Junio C Hamano | 13 December 2007, 00:52:59 UTC | Merge branch 'jc/merge-recursive-gitlink' * jc/merge-recursive-gitlink: Support a merge with conflicting gitlink change | 13 December 2007, 00:52:59 UTC |
| cfa97ae | Junio C Hamano | 13 December 2007, 00:52:51 UTC | Merge branch 'jk/svn-color' * jk/svn-color: git-svn: get color config from --get-colorbool Support GIT_PAGER_IN_USE environment variable | 13 December 2007, 00:52:51 UTC |
| c49d3c8 | Junio C Hamano | 12 December 2007, 21:42:12 UTC | git.spec.in: remove python_path We do not depend on python nor customize scripts for it anymore. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 21:42:12 UTC |
| 50b3555 | Junio C Hamano | 12 December 2007, 21:31:02 UTC | Documentation: rename git.texi to user-manual.texi Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 21:31:02 UTC |
| 8d08f2d | Junio C Hamano | 12 December 2007, 19:53:29 UTC | disable t9119 for now. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 19:53:29 UTC |
| 86f8c23 | Wincent Colaiuta | 12 December 2007, 16:22:59 UTC | Fix "diff --check" whitespace detection "diff --check" would only detect spaces before tabs if a tab was the last character in the leading indent. Fix that and add a test case to make sure the bug doesn't regress in the future. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 19:24:33 UTC |
| f604652 | Junio C Hamano | 12 December 2007, 07:46:30 UTC | git-diff --numstat -z: make it machine readable The "-z" format is all about machine parsability, but showing renamed paths as "common/{a => b}/suffix" makes it impossible. The scripts would never have successfully parsed "--numstat -z -M" in the old format. This fixes the output format in a (hopefully minimally) backward incompatible way. * The output without -z is not changed. This has given a good way for humans to view added and deleted lines separately, and showing the path in combined, shorter way would preserve readability. * The output with -z is unchanged for paths that do not involve renames. Existing scripts that do not pass -M/-C are not affected at all. * The output with -z for a renamed path is shown in a format that can easily be distinguished from an unrenamed path. This is based on Jakub Narebski's patch. Bugs and documentation typos are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| 71a9883 | Wincent Colaiuta | 12 December 2007, 08:14:20 UTC | Documentation: minor grammar fix for "git apply" Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| 0ac7903 | Wincent Colaiuta | 12 December 2007, 08:12:01 UTC | Use "whitespace" consistently For consistency, change "white space" and "whitespaces" to "whitespace", fixing a couple of adjacent grammar problems in the docs. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| 472b257 | Mike Hommey | 11 December 2007, 22:50:21 UTC | Fix XML parser leaks in http-push XML_Parser were never freed. While at it, move the parser initialization to right before it is needed. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| 03b69c7 | Mike Hommey | 11 December 2007, 21:59:55 UTC | Fix small memory leaks induced by diff_tree_setup_paths Run diff_tree_release_paths in the appropriate places, and add a test to avoid NULL dereference. Better safe than sorry. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| b0fe0d7 | Alex Riesen | 11 December 2007, 22:01:28 UTC | Fix git-fast-export for zero-sized blobs Writing 1 elements of size 0-byte successfully will cause fwrite(3) to return 0, and flagging it as error is a mistake. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| d4110a9 | Charles Bailey | 11 December 2007, 06:47:31 UTC | Fix clone not to ignore depth when performing a local clone When git-clone detects that it can perform a local clone it follows a path that silently ignores the depth parameter. Presumably if the user explicitly requests a shallow clone they have a reason to prefer a space efficient clone of just the recent history so bypass the local magic if the user specifies the depth parameter. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 18:59:22 UTC |
| 3384a2d | Junio C Hamano | 11 December 2007, 18:09:04 UTC | shortlog: default to HEAD when the standard input is a tty Instead of warning the user that it is expecting git log output from the standard input (and waiting for the user to type the log from the keyboard, which is a silly thing to do), default to traverse from HEAD when there is no rev parameter given and the standard input is a tty. This factors out a useful helper "add_head()" from builtin-diff.c to a more appropriate place revision.c while renaming it to more descriptive name add_head_to_pending(), as that is what the function is about. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 01:01:31 UTC |
| 7c3c796 | Junio C Hamano | 12 December 2007, 00:05:50 UTC | blame: drop blob data after passing blame to the parent We used to keep the blob data for each origin that has any remaining line in the result, but this will get very costly with a huge file that has a deep history. This patch releases the blob after we ran diff between the child rev and its parents. When passing blame from a parent to its parent (i.e. the grandparent), the blob data for the parent may need to be read again, but it should be relatively cheap, thanks to delta-base cache. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2007, 00:05:50 UTC |
| ef4cffd | Jeff King | 11 December 2007, 12:53:47 UTC | git-clone: print an error message when trying to clone empty repo Previously, cloning an empty repository looked like this: $ (mkdir parent && cd parent && git --bare init) $ git-clone parent child Initialized empty Git repository in /home/peff/clone/child/.git/ $ cd child -bash: cd: child: No such file or directory $ echo 'wtf?' | mail git@vger.kernel.org Now we at least report that the clone was not successful. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 19:07:23 UTC |
| 97566ea | Pierre Habouzit | 11 December 2007, 14:43:51 UTC | Invert numbers and names in the git-shortlog summary mode. Also make it `cut` friendly using a tab to separate the numbers and names. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 17:57:29 UTC |
| 6508bb7 | Jeff King | 11 December 2007, 12:33:12 UTC | shortlog: document -e option This shows e-mail address in addition to author's name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 17:56:27 UTC |
| 18ff365 | Alexandre Julliard | 11 December 2007, 12:56:09 UTC | git.el: Added a menu for git-status-mode. Originally written by Rémi Vanicat, I just changed the layout a little. Signed-off-by: Rémi Vanicat <vanicat@debian.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 17:55:21 UTC |
| 550f8fd | Johannes Sixt | 11 December 2007, 16:36:32 UTC | Fix a typo in checkout.sh and cleanup one-line help messages This also shortens option descriptions to fit in 80 columns. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 17:52:44 UTC |
| cd459e3 | Jeff King | 11 December 2007, 06:28:42 UTC | git-svn: get color config from --get-colorbool git-config recently learned a --get-colorbool option. By using it, we will get the same color=auto behavior that other git commands have. Specifically, this fixes the case where "color.diff = true" meant "always" in git-svn, but "auto" in other programs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:42:07 UTC |
| 6e9af86 | Jeff King | 11 December 2007, 06:27:33 UTC | Support GIT_PAGER_IN_USE environment variable When deciding whether or not to turn on automatic color support, git_config_colorbool checks whether stdout is a tty. However, because we run a pager, if stdout is not a tty, we must check whether it is because we started the pager. This used to be done by checking the pager_in_use variable. This variable was set only when the git program being run started the pager; there was no way for an external program running git indicate that it had already started a pager. This patch allows a program to set GIT_PAGER_IN_USE to a true value to indicate that even though stdout is not a tty, it is because a pager is being used. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:42:05 UTC |
| ff72af0 | Junio C Hamano | 10 December 2007, 19:22:05 UTC | Support a merge with conflicting gitlink change merge-recursive did not support merging trees that have conflicting changes in submodules they contain, and died. Support it exactly the same way as how it handles conflicting symbolic link changes --- mark it as a conflict, take the tentative result from the current side, and letting the caller resolve the conflict, without dying in merge_file() function. Also reword the error message issued when merge_file() has to die because it sees a tree entry of type it does not support yet. [jc: fixed up initial draft by Finn Arne Gangstad] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:40:56 UTC |
| bf82a15 | Junio C Hamano | 11 December 2007, 05:02:26 UTC | commit: do not add extra LF at the end of the summary. The scripted version relied on the nice "auto-strip the terminating LF" behaviour shell gives to "var=$(cmd)" construct, but we have to roll that ourselves. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:38:46 UTC |
| be15f50 | Linus Torvalds | 11 December 2007, 04:08:06 UTC | "git tag -u keyname" broken Commit 396865859918e9c7bf8ce74aae137c57da134610 broke signed tags using the "-u" flag when it made builtin-tag.c use parse_options() to parse its arguments (but it quite possibly was broken even before that, by the builtin rewrite). It used to be that passing the signing ID with the -u parameter also (obviously!) implied that you wanted to sign and annotate the tag, but that logic got dropped. It also totally ignored the actual key ID that was passed in. This reinstates it all. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:38:46 UTC |
| ace9c2a | Junio C Hamano | 11 December 2007, 05:44:42 UTC | send-email: do not muck with initial-reply-to when unset. When not prompting, initial_reply_to can be left unset. Do not try to sanitize it and get useless warning. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:38:46 UTC |
| 28072a5 | Gerrit Pape | 10 December 2007, 09:31:02 UTC | Don't cache DESTDIR in perl/perl.mak. DESTDIR is supposed to be overridden on 'make install' after doing 'make'. Have the automatically generated perl/perl.mak not cache the value of DESTDIR to support that for the perl/ subdirectory also. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:38:46 UTC |
| 923db42 | Jakub Narebski | 09 December 2007, 12:57:39 UTC | autoconf: Check asciidoc version to automatically set ASCIIDOC8 Check for asciidoc, and if it exists check asciidoc version, setting ASCIIDOC8 when needed. Currently it just runs asciidoc in asciidoc7 compatibility mode (see: Documentation/Makefile). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 08:38:38 UTC |
| 66ab84b | Eric Wong | 09 December 2007, 07:27:42 UTC | git-svn: reinstate old rev_db optimization in new rev_map This reinstates an old optimization in .rev_db which stored the highest revision number we scanned, allowing us to avoid scanning the SVN log for those revisions again in a subsequent invocation. This means the last 24-byte record in a .rev_map file can be a 4-byte SVN revision number with 20-bytes of zeroes representing a non-existent commit. This record can and will be overwritten when a new commit iff the commit is all zeroes. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 05:28:27 UTC |
| 060610c | Eric Wong | 09 December 2007, 07:27:41 UTC | git-svn: replace .rev_db with a more space-efficient .rev_map format Migrations are done automatically on an as-needed basis when new revisions are to be fetched. Stale remote branches do not get migrated, yet. However, unless you set noMetadata or useSvkProps it's safe to just do: find $GIT_DIR/svn -name '.rev_db*' -print0 | xargs rm -f to purge all the old .rev_db files. The new format is a one-way migration and is NOT compatible with old versions of git-svn. This is the replacement for the rev_db format, which was too big and inefficient for large repositories with a lot of sparse history (mainly tags). The format is this: - 24 bytes for every record, * 4 bytes for the integer representing an SVN revision number * 20 bytes representing the sha1 of a git commit - No empty padding records like the old format - new records are written append-only since SVN revision numbers increase monotonically - lookups on SVN revision number are done via a binary search - Piping the file to xxd(1) -c24 is a good way of dumping it for viewing or editing, should the need ever arise. As with .rev_db, these files are disposable unless noMetadata or useSvmProps is set. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 05:28:25 UTC |
| eb9688f | Nicolas Pitre | 10 December 2007, 19:19:32 UTC | pack-objects: more threaded load balancing fix with often changed paths The code that splits the object list amongst work threads tries to do so on "path" boundaries not to prevent good delta matches. However, in some cases, a few paths may largely dominate the hash distribution and it is not possible to have good load balancing without ignoring those boundaries. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2007, 01:10:16 UTC |
| c07c7bf | Daniel Barkalow | 10 December 2007, 03:05:34 UTC | Add more checkout tests If you have local changes that don't conflict with the branch-switching changes, these should be kept, not cause errors even without -m, and be reported afterwards in name-status format. With -m, the changes carried across should be listed as well. And, for now, include the merge-recursive output from this process. Also test the detatched head message in at least one case. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 19:24:56 UTC |
| bf79caf | Jeff King | 10 December 2007, 10:29:18 UTC | Add git-browse-help to .gitignore Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 19:22:51 UTC |
| e306be5 | Eyvind Bernhardsen | 10 December 2007, 13:40:20 UTC | Fix mis-markup of the -p, --patch option in git-add(1) An item in a bulletted list in AsciiDoc is followed with two colons, not just one. Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 18:58:09 UTC |
| a149a1a | Junio C Hamano | 10 December 2007, 09:35:29 UTC | git-help -i: show info documentation from matching version of git Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 09:36:31 UTC |
| 78d39f9 | Junio C Hamano | 10 December 2007, 09:19:31 UTC | git-help -i: invoke info with document and node name Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 09:36:31 UTC |
| 5cefc33 | Junio C Hamano | 10 December 2007, 09:15:57 UTC | Documentation: add gitman.info target Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 09:36:13 UTC |
| 7be2b6e | Junio C Hamano | 10 December 2007, 09:22:42 UTC | Merge branch 'master' into cc/help This is to primarily pull in MANPATH tweak and help.txt formatting fix from the master branch. | 10 December 2007, 09:22:42 UTC |
| 591aa25 | Junio C Hamano | 10 December 2007, 08:07:18 UTC | Update draft Release Notes for 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 08:08:05 UTC |
| cf7e147 | Wincent Colaiuta | 10 December 2007, 07:42:45 UTC | Style fixes for pre-commit hook tests As pointed out by Junio on the mailing list, surrounding tests in double quotes can lead to bugs wherein variables get substituted away, so this isn't just style churn but important to prevent others from looking at these tests in the future and thinking that this is "the way" that Git tests should be written. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 08:05:52 UTC |
| 80f8660 | Wincent Colaiuta | 10 December 2007, 07:33:26 UTC | Interactive editor tests for commit-msg hook Supplement the existing tests for the commit-msg hook (which all use "git commit -m") with tests which use an interactive editor (no -m switch) to ensure that all code paths get tested. At the same time the quoting of some of the existing tests is changed to conform to Junio's recommendations for test style (single quotes used around the test unless there is a compelling reason not to, and the opening quote on the same line as the test_expect and the closing quote in column 1). Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2007, 08:05:52 UTC |
| 3d3c4f5 | Junio C Hamano | 09 December 2007, 20:16:55 UTC | Re-fix ls-remote An earlier attempt in 2ea7fe0 (ls-remote: resurrect pattern limit support) forgot that the user string can also be a glob. This should finally fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 20:18:42 UTC |
| cc3530e | Mike Hommey | 09 December 2007, 17:04:57 UTC | Cleanup variables in http.[ch] Quite some variables defined as extern in http.h are only used in http.c, and some others, only defined in http.c, were not static. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 20:18:42 UTC |
| ace7208 | Mike Hommey | 09 December 2007, 17:17:28 UTC | git-send-email.perl: Really add angle brackets to In-Reply-To if necessary 3803bcea tried to fix this, but it only adds the branckes when the given In-Reply-To begins and ends with whitespaces. It also didn't do anything to the --in-reply-to argument. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 20:18:37 UTC |
| cc2d6b8 | Jeff King | 09 December 2007, 08:21:34 UTC | don't mention index refreshing side effect in git-status docs The tip about speeding up subsequent operations is now obsolete; since aecbf914, git-diff now squelches empty diffs and performs an automatic refresh. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 10:39:53 UTC |
| bb4e352 | Nguyễn Thái Ngọc Duy | 09 December 2007, 10:14:39 UTC | Remove repo version check from setup_git_directory setup_git_directory_gently has done the check already. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 10:24:51 UTC |
| 4eb39e9 | Junio C Hamano | 09 December 2007, 09:23:48 UTC | Merge branch 'jc/spht' * jc/spht: Use gitattributes to define per-path whitespace rule core.whitespace: documentation updates. builtin-apply: teach whitespace_rules builtin-apply: rename "whitespace" variables and fix styles core.whitespace: add test for diff whitespace error highlighting git-diff: complain about >=8 consecutive spaces in initial indent War on whitespace: first, a bit of retreat. Conflicts: cache.h config.c diff.c | 09 December 2007, 09:23:48 UTC |
| c07a07c | Christian Couder | 05 December 2007, 05:09:40 UTC | Documentation: describe -w/--web option to "git-help". Also explain that "git instaweb" may use "web.browser" config variable. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 09:19:54 UTC |
| d3a866b | Christian Couder | 02 December 2007, 05:08:00 UTC | Use {web,instaweb,help}.browser config options. Now "git-instaweb" will try to use the browser configured as "web.browser", if "instaweb.browser" is not set. "git-browse-help" will check first "help.browser" and then "web.browser". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 09:19:54 UTC |
| 5d6491c | Christian Couder | 02 December 2007, 05:07:55 UTC | git-help: add -w|--web option to display html man page in a browser. Now when using "git help -w cmd", we will try to show the HTML man page "git-cmd.html" in your prefered web browser. To do that "help.c" code will call a new shell script "git-browse-help". This currently works only if the HTML versions of the man page have been installed in $(htmldir) (typically "/usr/share/doc/git-doc"), so new target to do that is added to "Documentation/Makefile". The browser to use can be configured using the "web.browser" config variable. We try to open a new tab in an existing web browser, if possible. The code in "git-browse-help" is heavily stolen from "git-mergetool" by Theodore Y. Ts'o. Thanks. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2007, 09:19:44 UTC |
| 05e74f4 | Junio C Hamano | 09 December 2007, 09:01:50 UTC | Merge branch 'pr/mergetool' * pr/mergetool: Open external merge tool with original file extensions for all three files | 09 December 2007, 09:01:50 UTC |
