| b809d9c | Junio C Hamano | 02 December 2009, 18:50:17 UTC | Git 1.6.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:50:17 UTC |
| c0ecb07 | Horst H. von Brand | 01 December 2009, 22:44:11 UTC | git-pull.sh: Fix call to git-merge for new command format Now "git merge <msg> HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:42:48 UTC |
| 0748494 | Junio C Hamano | 02 December 2009, 18:30:12 UTC | Merge branch 'maint' * maint: Prepare for 1.6.5.4 merge: do not add standard message when message is given with -m option Do not misidentify "git merge foo HEAD" as an old-style invocation Conflicts: RelNotes | 02 December 2009, 18:30:12 UTC |
| 28044ba | Junio C Hamano | 02 December 2009, 18:29:00 UTC | Prepare for 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:29:00 UTC |
| ce9d823 | Junio C Hamano | 02 December 2009, 18:00:58 UTC | merge: do not add standard message when message is given with -m option Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいし ななこ <nanako3@lavabit.com> Date: Wed Dec 2 14:33:20 2009 +0900 Merge early part of side branch Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23' The gave her own message because she didn't want git to add the standard message (if she wanted to, she wouldn't have given one, or she would have prepared it using git-fmt-merge-msg command). Noticed by Nanako Shiraishi Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:02:08 UTC |
| 76bf488 | Junio C Hamano | 02 December 2009, 17:59:35 UTC | Do not misidentify "git merge foo HEAD" as an old-style invocation This was misinterpreted as an ancient style "git merge <message> HEAD <commit> <commit>..." that merges one (or more) <commit> into the current branch and record the resulting commit with the given message. Then a later sanity check found that there is no <commit> specified and gave a usage message. Tested-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:01:59 UTC |
| c86485d | Junio C Hamano | 30 November 2009, 23:54:08 UTC | Update draft release notes to 1.6.6 before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:50:23 UTC |
| 32ef08f | Junio C Hamano | 01 December 2009, 20:47:04 UTC | Merge branch 'maint' * maint: help: Do not unnecessarily look for a repository Documentation: Fix a few i.e./e.g. mix-ups Documentation: Document --branch option in git clone synopsis | 01 December 2009, 20:47:04 UTC |
| 36a83f3 | Junio C Hamano | 01 December 2009, 20:47:01 UTC | Merge branch 'jc/deprecate-old-syntax-from-merge' * jc/deprecate-old-syntax-from-merge: git-merge: a deprecation notice of the ancient command line syntax | 01 December 2009, 20:47:01 UTC |
| b81e00a | Junio C Hamano | 01 December 2009, 00:23:50 UTC | git-merge: a deprecation notice of the ancient command line syntax The ancient form of git merge command used in the original sample script has been copied from Linus and are still found everywhere, I think, and people may still have it in their scripts, but on the other hand, it is so unintuitive that even people reasonably familiar with git are surprised by accidentally triggering the support to parse this ancient form. Gently nudge people to upgrade their script to more recent and readable style for eventual removal of the original syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:45:34 UTC |
| 4a27759 | Junio C Hamano | 01 December 2009, 20:26:45 UTC | Merge branch 'bw/remote-get-ref-states-fix' * bw/remote-get-ref-states-fix: get_ref_states: strdup entries and free util in stale list | 01 December 2009, 20:26:45 UTC |
| 92f676f | Bert Wesarg | 30 November 2009, 23:57:27 UTC | get_ref_states: strdup entries and free util in stale list The entries in states->stale list is filled in handle_one_branch() that is a call-back funcation to for_each_ref() using the callback parameter given to it. We need to strdup() the refnames (both the string list key and the value stored in util) for more permanent storage and free them when we are done. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:26:32 UTC |
| af6fbf9 | David Aguilar | 01 December 2009, 19:27:34 UTC | help: Do not unnecessarily look for a repository Although 'git help' actually doesn't need to be run inside a git repository and uses no repository-specific information, it looks for a git directory. Searching for a git directory can be annoying in auto-mount environments. With this commit, 'git help' no longer searches for a repository when run without any options. 7c3baa9 originally modified 'git help -a' to not require a repository. This applies the same fix for 'git help'. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:10:09 UTC |
| 3c652d1 | Michael J Gruber | 01 December 2009, 09:19:05 UTC | Documentation: Fix a few i.e./e.g. mix-ups A git bundle can be transported by several means (such as e-mail), not only by snekaernet, so use e.g. instead of i.e. The mix-up in git-bundle.txt is obvious. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:09:46 UTC |
| 8678bc0 | Junio C Hamano | 01 December 2009, 19:28:15 UTC | Merge branch 'jn/gitweb-blame' * jn/gitweb-blame: gitweb: Add link to other blame implementation in blame views gitweb: Make linking to actions requiring JavaScript a feature gitweb.js: fix padLeftStr() and its usage gitweb.js: Harden setting blamed commit info in incremental blame gitweb.js: fix null object exception in initials calculation gitweb: Minify gitweb.js if JSMIN is defined gitweb: Create links leading to 'blame_incremental' using JavaScript gitweb: Colorize 'blame_incremental' view during processing gitweb: Incremental blame (using JavaScript) gitweb: Add optional "time to generate page" info in footer Conflicts: Makefile gitweb/gitweb.css | 01 December 2009, 19:28:15 UTC |
| 87e573f | Jakub Narebski | 01 December 2009, 16:54:26 UTC | gitweb: Add link to other blame implementation in blame views Add link to 'blame_incremental' action (which requires JavaScript) in 'blame' view, and add link to 'blame' action in 'blame_incremental' view. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 19:25:21 UTC |
| e627e50 | Jakub Narebski | 26 November 2009, 20:12:15 UTC | gitweb: Make linking to actions requiring JavaScript a feature Let gitweb turn some links (like 'blame' links) into linking to actions which require JavaScript (like 'blame_incremental' action) only if 'javascript-actions' feature is enabled. This means that links to such actions would be present only if both JavaScript is enabled and 'javascript-actions' feature is enabled. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 04:09:41 UTC |
| 9eba92f | Junio C Hamano | 30 November 2009, 22:46:09 UTC | Merge branch 'fc/maint-format-patch-pathspec-dashes' Conflicts: t/t4014-format-patch.sh | 30 November 2009, 22:46:09 UTC |
| 045c050 | Junio C Hamano | 30 November 2009, 22:45:08 UTC | Merge branch 'mm/maint-merge-ff-error-message-fix' Conflicts: merge-recursive.c | 30 November 2009, 22:45:08 UTC |
| 22c4e72 | Junio C Hamano | 30 November 2009, 22:44:43 UTC | Merge branch 'ap/maint-merge-strategy-list-fix' | 30 November 2009, 22:44:43 UTC |
| 684d0d8 | Junio C Hamano | 30 November 2009, 22:44:22 UTC | Merge branch 'jc/pretty-lf' Conflicts: pretty.c t/t6006-rev-list-format.sh | 30 November 2009, 22:44:22 UTC |
| 261fbda | Junio C Hamano | 30 November 2009, 22:43:51 UTC | Merge branch 'cc/bisect-doc' | 30 November 2009, 22:43:51 UTC |
| c142465 | Junio C Hamano | 30 November 2009, 22:43:26 UTC | Merge branch 'em/commit-claim' | 30 November 2009, 22:43:26 UTC |
| d268cb9 | Junio C Hamano | 30 November 2009, 22:43:24 UTC | Merge branch 'jc/mailinfo-remove-brackets' Conflicts: Documentation/git-mailinfo.txt builtin-mailinfo.c | 30 November 2009, 22:43:24 UTC |
| 0c7cc13 | Junio C Hamano | 30 November 2009, 22:42:50 UTC | Merge branch 'fc/send-email-envelope' | 30 November 2009, 22:42:50 UTC |
| a689fae | Junio C Hamano | 30 November 2009, 22:42:28 UTC | Merge branch 'uk/maint-shortlog-encoding' Conflicts: builtin-shortlog.c | 30 November 2009, 22:42:28 UTC |
| 1bab4bb | Junio C Hamano | 30 November 2009, 22:35:18 UTC | Merge branch 'ns/send-email-no-chain-reply-to' | 30 November 2009, 22:35:18 UTC |
| 5e2f779 | Junio C Hamano | 30 November 2009, 22:35:07 UTC | Merge branch 'jc/maint-am-keep' | 30 November 2009, 22:35:07 UTC |
| b918eb6 | Junio C Hamano | 30 November 2009, 22:34:45 UTC | Merge branch 'bw/diff-color-hunk-header' | 30 November 2009, 22:34:45 UTC |
| db9bc00 | David Soria Parra | 30 November 2009, 13:27:52 UTC | Documentation: Document --branch option in git clone synopsis Document the --branch option as [-b <name>] in git clones synopsis. Signed-off-by: David Soria Parra <dsp@php.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 16:47:54 UTC |
| e2ced7d | Matthieu Moy | 29 November 2009, 12:18:33 UTC | builtin-merge: show user-friendly error messages for fast-forward too. fadd069d03 (merge-recursive: give less scary messages when merge did not start, Sep 7 2009) introduced some friendlier error message for merge failure, but the messages were shown only for non-fast forward merges. This patch uses the same for fast-forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:52:40 UTC |
| 264b774 | Matthieu Moy | 29 November 2009, 12:18:32 UTC | merge-recursive: make the error-message generation an extern function The construction of the struct unpack_trees_error_msgs was done within git_merge_trees(), which prevented using the same messages easily from another function. [jc: backported for 1.6.5 maint before advice_commit_before_merge] Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:52:31 UTC |
| e160da7 | Matthew Ogilvie | 30 November 2009, 06:19:28 UTC | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH These were added without documentation in 2009-03-16 (6720721). Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:09:56 UTC |
| 5d59a40 | Matthew Ogilvie | 28 November 2009, 18:38:55 UTC | t3409 t4107 t7406 t9150: use dashless commands This is needed to allow test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:09:47 UTC |
| ed87465 | Avery Pennarun | 26 November 2009, 02:23:54 UTC | builtin-merge.c: call exclude_cmds() correctly. We need to call exclude_cmds() after the loop, not during the loop, because excluding a command from the array can change the indexes of objects in the array. The result is that, depending on file ordering, some commands weren't excluded as they should have been. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 02:49:11 UTC |
| 42ac496 | Matthew Ogilvie | 28 November 2009, 18:38:54 UTC | t2300: use documented technique to invoke git-sh-setup This is needed to allow the test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 02:00:14 UTC |
| 528fb08 | Nanako Shiraishi | 29 November 2009, 03:24:48 UTC | prepare send-email for smoother change of --chain-reply-to default Give a warning message when send-email uses chain-reply-to to thread the messages because of the current default, not because the user explicitly asked to, either from the command line or from the configuration. This way, by the time 1.7.0 switches the default, everybody will be ready. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2009, 08:51:35 UTC |
| 66abce0 | Junio C Hamano | 28 November 2009, 19:13:59 UTC | Update draft release notes to 1.6.6 before merging topics for -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2009, 19:13:59 UTC |
| 7fc9d15 | Jonathan Nieder | 28 November 2009, 11:41:28 UTC | Makefile: do not clean arm directory The ARM SHA-1 implementation was removed by commit 30ae47b (remove ARM and Mozilla SHA1 implementations, 2009-08-17). Prune its directory from the list of object files to delete in 'make clean'. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2009, 18:09:56 UTC |
| 89cb73a | Bert Wesarg | 27 November 2009, 06:55:18 UTC | Give the hunk comment its own color Inspired by the coloring of quilt. Introduce a separate color and paint the hunk comment part, i.e. the name of the function, in a separate color "diff.func" (defaults to plain). Whitespace between hunk header and hunk comment is printed in plain color. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2009, 18:05:44 UTC |
| c89e324 | Felipe Contreras | 26 November 2009, 19:04:29 UTC | send-email: automatic envelope sender This adds the option to specify the envelope sender as "auto" which would pick the 'from' address. This is good because now we can specify the address only in one place in $HOME/.gitconfig and change it easily. [jc: added tests] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2009, 07:45:24 UTC |
| 06a4755 | Junio C Hamano | 28 November 2009, 06:04:10 UTC | emit_line(): don't emit an empty <SET><RESET> followed by a newline When emit_line() is called with an empty line (but non-zero length, as we send line terminating LF or CRLF to the function), it used to emit <SET><RESET> followed by a newline. Stop the wastefulness. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2009, 06:33:53 UTC |
| c970a6f | Junio C Hamano | 27 November 2009, 23:06:37 UTC | Remove dead code from "git am" Ever since the initial implementation, "git am" had kept a dead code that never triggered due to a typo in the variable name. Worse yet, the code, if it weren't for the typo, would have attempted to add "[PATCH] " at the beginning of the Subject: header when "git am" is run with its "-k" option. However, because "git am -k" tells mailinfo to keep such prefix when parsing the input, the "[PATCH] " added by this dead code would have really been unnecessary duplicate. Embarrassing is that we kept _maintaining_ the codepath without anybody noticing for four years. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 23:11:47 UTC |
| 41d5b7e | Junio C Hamano | 27 November 2009, 08:56:05 UTC | Merge branch 'maint' * maint: builtin-apply.c: pay attention to -p<n> when determining the name | 27 November 2009, 08:56:05 UTC |
| e7821d7 | Johannes Sixt | 27 November 2009, 07:42:25 UTC | Add a notice that only certain functions can print color escape codes We emulate color escape codes on Windows by overriding printf, fprintf, and fputs. Warn developers that these are the only functions that can be used to print them. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 08:28:40 UTC |
| 7e93d3b | Felipe Contreras | 26 November 2009, 19:12:00 UTC | format-patch: add test for parsing of "--" Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 05:23:55 UTC |
| 382da40 | Felipe Contreras | 26 November 2009, 19:11:59 UTC | format-patch: fix parsing of "--" on the command line When given a pathspec that does not match any path in the current work tree with an explicit "--": git format-patch <commit> -- <path> the command still complains that <path> does not exist in the current work tree and the user needs to explicitly specify "--" and errors out. This is because it incorrectly removes "--" from the command line arguments that is later passed to setup_revisions(). Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 05:16:54 UTC |
| ec7fc0b | Junio C Hamano | 25 November 2009, 10:56:54 UTC | builtin-apply.c: pay attention to -p<n> when determining the name The patch structure has def_name component that is used to validate the sanity of a "diff --git" patch by checking pathnames that appear on the patch header lines for consistency. The git_header_name() function is used to compute this out of "diff --git a/... b/..." line, but the code always stripped one level of prefix (i.e. "a/" and "b/"), without paying attention to -p<n> option. Code in find_name() function that parses other lines in the patch header (e.g. "--- a/..." and "+++ b/..." lines) however did strip the correct number of leading paths prefixes, and the sanity check between these computed values failed. Teach git_header_name() to honor -p<n> option like find_name() function does. Found and reported by Steven J. Murdoch who also wrote tests. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 03:02:24 UTC |
| c8e1c3d | Björn Gustavsson | 26 November 2009, 21:49:50 UTC | gitworkflows: Consistently back-quote git commands Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 02:33:34 UTC |
| 79f7ca0 | Uwe Kleine-König | 25 November 2009, 19:33:28 UTC | shortlog: respect commit encoding Don't take the author name information without re-encoding from the raw commit object buffer. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 23:36:54 UTC |
| ad7ace7 | Junio C Hamano | 25 November 2009, 19:45:07 UTC | Merge branch 'rs/work-around-grep-opt-insanity' * rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() Conflicts: git-instaweb.sh | 25 November 2009, 19:45:07 UTC |
| b073b7a | Benjamin Kramer | 18 November 2009, 13:53:27 UTC | Explicitly truncate bswap operand to uint32_t There are some places in git where a long is passed to htonl/ntohl. llvm doesn't support matching operands of different bitwidths intentionally. This patch fixes the build with llvm-gcc (and clang) on x86_64. Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 08:16:38 UTC |
| 6821dee | Stephen Boyd | 25 November 2009, 03:51:40 UTC | gitweb.js: fix padLeftStr() and its usage It seems that in Firefox-3.5 inserting with javascript inserts the literal instead of a space. Fix this by inserting the unicode representation for instead. Also fix the off-by-one error in the padding calculation that was causing one less space to be inserted than was requested by the caller. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Cc: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 08:06:32 UTC |
| 6aa2de5 | Jakub Narebski | 25 November 2009, 00:45:15 UTC | gitweb.js: Harden setting blamed commit info in incremental blame Internet Explorer 8 stops at beginning of blame filling with the following bug: "firstChild is null or not an object" at this line: a_sha1.firstChild.data = commit.sha1.substr(0, 8); It is (probably) caused by the fact that while a_sha1 element, which looks like this: <a href=""> </a> It has a firstChild which is a text node containing only whitespace (single space character) in other web browsers (Firefox 3.5, Opera 10, Google Chrome 3.0), IE8 clobbers DOM, removing trailing/leading whitespace. Protect against this bug by creating text element if it does not exist. Found-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 08:04:39 UTC |
| 5d166cc | Nanako Shiraishi | 24 November 2009, 23:08:08 UTC | t1200: fix a timing dependent error The fourth test of show-branch in t1200 test was failing but only sometimes. It only failed when two commits created in an earlier test had different timestamps. When they were created within the same second, the actual output matched the expected output. Fix this by using test_tick to force reliable timestamps and update the expected output so it does not to depend on the commits made in the same sacond. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 08:00:32 UTC |
| ba2c747 | Junio C Hamano | 24 November 2009, 23:42:55 UTC | Merge branch 'rj/maint-cygwin-count-objects' * rj/maint-cygwin-count-objects: git-count-objects: Fix a disk-space under-estimate on Cygwin | 24 November 2009, 23:42:55 UTC |
| af06e93 | Christian Couder | 24 November 2009, 06:54:44 UTC | Documentation: update descriptions of revision options related to '--bisect' In commit ad3f9a7 (Add '--bisect' revision machinery argument) the '--bisect' option was added to easily pass bisection refs to commands using the revision machinery. This patch updates the documentation of the related options to describe the new behavior. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 09:00:34 UTC |
| fe3b2b7 | Martin Storsjö | 23 November 2009, 22:55:50 UTC | Enable support for IPv6 on MinGW The IPv6 support functions are loaded dynamically, to maintain backwards compatibility with versions of Windows prior to XP, and fallback wrappers are provided, implemented in terms of gethostbyname and gethostbyaddr. Signed-off-by: Martin Storsjo <martin@martin.st> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 08:58:17 UTC |
| b7cc9f8 | Martin Storsjö | 23 November 2009, 22:55:12 UTC | Refactor winsock initialization into a separate function The winsock library must be initialized. Since gethostbyname() is the first function that calls into winsock, it was overridden to do the initialization. This refactoring helps the next patch, where other functions can be called earlier. Signed-off-by: Martin Storsjo <martin@martin.st> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 08:57:39 UTC |
| 1fdffa6 | Junio C Hamano | 24 November 2009, 06:33:30 UTC | Merge branch 'rs/color-escape-has-zero-width' * rs/color-escape-has-zero-width: strbuf_add_wrapped_text(): skip over colour codes | 24 November 2009, 06:33:30 UTC |
| d2cd665 | Junio C Hamano | 24 November 2009, 06:32:39 UTC | Merge branch 'bg/apply-doc' * bg/apply-doc: Fix over-simplified documentation for 'git log -z' apply: Use the term "working tree" consistently apply: Format all options using back-quotes apply: apply works outside a repository Clarify and correct -z | 24 November 2009, 06:32:39 UTC |
| 444e10d | Junio C Hamano | 24 November 2009, 06:31:51 UTC | Merge branch 'mm/maint-hint-failed-merge' * mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten. | 24 November 2009, 06:31:51 UTC |
| e61f25f | Junio C Hamano | 24 November 2009, 06:30:08 UTC | Merge branch 'jc/log-stdin' * jc/log-stdin: Add trivial tests for --stdin option to log family Make --stdin option to "log" family read also pathspecs setup_revisions(): do not call get_pathspec() too early Teach --stdin option to "log" family read_revision_from_stdin(): use strbuf Conflicts: revision.c | 24 November 2009, 06:30:08 UTC |
| 2a97101 | Junio C Hamano | 24 November 2009, 06:28:31 UTC | Merge branch 'mr/gitweb-snapshot' * mr/gitweb-snapshot: t/gitweb-lib: Split HTTP response with non-GNU sed gitweb: Smarter snapshot names gitweb: Document current snapshot rules via new tests t/gitweb-lib.sh: Split gitweb output into headers and body gitweb: check given hash before trying to create snapshot | 24 November 2009, 06:28:31 UTC |
| f74a83f | Brian Gernhardt | 23 November 2009, 17:33:42 UTC | t/gitweb-lib: Split HTTP response with non-GNU sed Recognizing \r in a regex is something GNU sed will do, but other sed implementation's won't (e.g. BSD sed on OS X). Instead of two sed invocations, use a single Perl script to split output into headers and body. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 06:26:58 UTC |
| 783cfaf | Junio C Hamano | 24 November 2009, 06:24:01 UTC | Merge branch 'cc/replace' * cc/replace: Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS Documentation: fix typos and spelling in replace documentation replace: use a GIT_NO_REPLACE_OBJECTS env variable | 24 November 2009, 06:24:01 UTC |
| 75a7ea2 | Junio C Hamano | 24 November 2009, 05:54:39 UTC | Merge branch 'maint' * maint: pack-objects: split implications of --all-progress from progress activation instaweb: restart server if already running prune-packed: only show progress when stderr is a tty Conflicts: builtin-pack-objects.c | 24 November 2009, 05:54:39 UTC |
| 4f36627 | Nicolas Pitre | 23 November 2009, 17:43:50 UTC | pack-objects: split implications of --all-progress from progress activation Currently the --all-progress flag is used to use force progress display during the writing object phase even if output goes to stdout which is primarily the case during a push operation. This has the unfortunate side effect of forcing progress display even if stderr is not a terminal. Let's introduce the --all-progress-implied argument which has the same intent except for actually forcing the activation of any progress display. With this, progress display will be automatically inhibited whenever stderr is not a terminal, or full progress display will be included otherwise. This should let people use 'git push' within a cron job without filling their logs with useless percentage displays. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Tested-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:33:09 UTC |
| 0b624b4 | Stephen Boyd | 23 November 2009, 07:09:12 UTC | instaweb: restart server if already running Running 'git instaweb' when an instaweb server is already running will fail (at least when the port is the same) and overwrite the pid file used to track the currently running server. This turns out to be especially annoying when the user tries to stop the previously running server with 'git instaweb --stop' and is instead greeted with an error message because the pid file has been destroyed. Instead of allowing a user to start two instaweb servers, stop the currently running server first and then start the new one. This should be fine because it was never really possible to start two instaweb servers in the first place due to the pid file issue outlined above. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:31:01 UTC |
| 1ddf5ef | Jeff King | 24 November 2009, 03:07:42 UTC | prune-packed: only show progress when stderr is a tty This matches the behavior of other git programs, and helps keep cruft out of things like cron job output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:29:45 UTC |
| 4831060 | Tay Ray Chuan | 24 November 2009, 02:31:30 UTC | remote-curl.c: fix rpc_out() Remove the extraneous semicolon (';') at the end of the if statement that allowed the code in its block to execute regardless of the condition. This fixes pushing to a smart http backend with chunked encoding. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:25:55 UTC |
| e1622bf | Junio C Hamano | 23 November 2009, 23:56:32 UTC | Protect scripted Porcelains from GREP_OPTIONS insanity If the user has exported the GREP_OPTIONS environment variable, the output from "grep" and "egrep" in scripted Porcelains may be different from what they expect. For example, we may want to count number of matching lines, by "grep" piped to "wc -l", and GREP_OPTIONS=-C3 will break such use. The approach taken by this change to address this issue is to protect only our own use of grep/egrep. Because we do not unset it at the beginning of our scripts, hook scripts run from the scripted Porcelains are exposed to the same insanity this environment variable causes when grep/egrep is used to implement logic (e.g. "grep | wc -l"), and it is entirely up to the hook scripts to protect themselves. On the other hand, applypatch-msg hook may want to show offending words in the proposed commit log message using grep to the end user, and the user might want to set GREP_OPTIONS=--color to paint the match more visibly. The approach to protect only our own use without unsetting the environment variable globally will allow this use case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 00:31:07 UTC |
| 7b10422 | René Scharfe | 23 November 2009, 23:29:17 UTC | mergetool--lib: simplify guess_merge_tool() Use a case statement instead of calling grep to find out if the editor's name contains the string "vim". Remove the check for emacs, as this branch did the same as the default one anyway. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 23:38:04 UTC |
| 8a3c63e | René Scharfe | 23 November 2009, 22:40:03 UTC | strbuf_add_wrapped_text(): skip over colour codes Ignore display mode escape sequences (colour codes) for the purpose of text wrapping because they don't have a visible width. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 23:36:07 UTC |
| 4fa80cf | Johannes Sixt | 23 November 2009, 09:35:53 UTC | t4014-format-patch: do not assume 'test' is available as non-builtin One test case used 'xargs test', which assumes that 'test' is available as external program. At least on MinGW it is not. Moreover, 'git format-patch' was invoked in a pipeline, but not as the last command. Rewrite the test case to catch breakage in 'git format-patch' as well. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 10:55:59 UTC |
| 5c931c8 | Björn Gustavsson | 23 November 2009, 07:40:24 UTC | Fix over-simplified documentation for 'git log -z' In commit 64485b4a, the documentation for 'git log -z' was simplified too much. The -z option actually changes the behavior of 'git log' in two ways: commits will be ended with a NUL instead of a LF (correctly documented) and the --raw and --numstat will have NUL as field terminators (omitted in the documentation for 'git log'). Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 09:21:51 UTC |
| d21fc93 | Junio C Hamano | 23 November 2009, 08:49:47 UTC | Add trivial tests for --stdin option to log family Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 08:49:47 UTC |
| 65c042d | Junio C Hamano | 23 November 2009, 08:03:15 UTC | Merge branch 'bg/fetch-multi' * bg/fetch-multi: Re-implement 'git remote update' using 'git fetch' builtin-fetch: add --dry-run option builtin-fetch: add --prune option teach warn_dangling_symref to take a FILE argument remote: refactor some logic into get_stale_heads() Add missing test for 'git remote update --prune' Add the configuration option skipFetchAll Teach the --multiple option to 'git fetch' Teach the --all option to 'git fetch' | 23 November 2009, 08:03:15 UTC |
| fc13aa3 | Christian Couder | 23 November 2009, 04:16:14 UTC | bisect: simplify calling visualizer using '--bisect' option In commit ad3f9a7 (Add '--bisect' revision machinery argument) the '--bisect' option was added to easily pass bisection refs to commands using the revision machinery. So it is now shorter and safer to use the new '--bisect' revision machinery option, than to compute the refs that we must pass. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 06:59:05 UTC |
| d21f979 | Martin Storsjö | 23 November 2009, 03:03:28 UTC | Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST This works around a bug in curl versions up to 7.19.4, where disabling the CURLOPT_NOBODY option sets the internal state incorrectly considering that CURLOPT_PUT was enabled earlier. The bug is discussed at http://curl.haxx.se/bug/view.cgi?id=2727981 and is corrected in the latest version of curl in CVS. This bug usually has no impact on git, but may surface if using multi-pass authentication methods. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 06:56:54 UTC |
| 7b35724 | Matthew Ogilvie | 23 November 2009, 02:07:30 UTC | config documentation: some configs are auto-set by git-init Add documentation for core.ignorecase, and mention git-init in core.filemode and core.symlinks. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 06:56:38 UTC |
| 2fdc0cf | Matthew Ogilvie | 23 November 2009, 02:07:29 UTC | cvsserver doc: database generally can not be reproduced consistently A regenerated git-cvsserver database is at risk of having different CVS revision numbers from an incrementally updated database. Mention this in the the documentation, and remove an erroneous statement to the contrary. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 06:56:32 UTC |
| 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 |
