| 45e9a82 | Junio C Hamano | 30 June 2010, 19:22:13 UTC | Git 1.7.2-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2010, 22:49:18 UTC |
| 88202b9 | Junio C Hamano | 30 June 2010, 22:49:07 UTC | git.spec.in: Add gitweb subpackage Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2010, 22:49:18 UTC |
| 2927a50 | Junio C Hamano | 30 June 2010, 18:55:40 UTC | Merge branch 'ar/decorate-color' * ar/decorate-color: Add test for correct coloring of git log --decoration Allow customizable commit decorations colors log --decorate: Colorize commit decorations log-tree.c: Use struct name_decoration's type for classifying decoration commit.h: add 'type' to struct name_decoration | 30 June 2010, 18:55:40 UTC |
| 54ed6a9 | Junio C Hamano | 30 June 2010, 18:55:40 UTC | Merge branch 'mg/doc-rev-parse-treepath-syntax' * mg/doc-rev-parse-treepath-syntax: git-rev-parse.txt: Add more examples for caret and colon git-rev-parse.txt: Document ":path" specifier | 30 June 2010, 18:55:40 UTC |
| 01aedc9 | Junio C Hamano | 30 June 2010, 18:55:39 UTC | Merge branch 'cc/cherry-pick-stdin' * cc/cherry-pick-stdin: revert: do not rebuild argv on heap revert: accept arbitrary rev-list options t3508 (cherry-pick): futureproof against unmerged files | 30 June 2010, 18:55:39 UTC |
| a76b208 | Junio C Hamano | 30 June 2010, 18:55:39 UTC | Merge branch 'jl/status-ignore-submodules' * jl/status-ignore-submodules: Add the option "--ignore-submodules" to "git status" git submodule: ignore dirty submodules for summary and status Conflicts: builtin/commit.c t/t7508-status.sh wt-status.c wt-status.h | 30 June 2010, 18:55:39 UTC |
| 978327f | Junio C Hamano | 30 June 2010, 18:55:38 UTC | Merge branch 'jk/url-decode' * jk/url-decode: url_decode: URL scheme ends with a colon and does not require a slash | 30 June 2010, 18:55:38 UTC |
| 6f82be0 | Junio C Hamano | 30 June 2010, 18:55:38 UTC | Merge branch 'jn/grep-open' * jn/grep-open: t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script t/t7811-grep-open.sh: ensure fake "less" is made executable t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression grep -O: allow optional argument specifying the pager (or editor) grep: Add the option '--open-files-in-pager' Unify code paths of threaded greps grep: refactor grep_objects loop into its own function Conflicts: t/t7006-pager.sh | 30 June 2010, 18:55:38 UTC |
| a53deac | Junio C Hamano | 30 June 2010, 18:55:38 UTC | Merge branch 'jp/string-list-api-cleanup' * jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list | 30 June 2010, 18:55:38 UTC |
| 6296062 | Junio C Hamano | 30 June 2010, 18:55:38 UTC | Merge branch 'tr/rev-list-count' * tr/rev-list-count: bash completion: Support "divergence from upstream" messages in __git_ps1 rev-list: introduce --count option Conflicts: contrib/completion/git-completion.bash | 30 June 2010, 18:55:38 UTC |
| 304d8b6 | Junio C Hamano | 30 June 2010, 18:55:37 UTC | Merge branch 'as/maint-completion-set-u-fix' * as/maint-completion-set-u-fix: bash-completion: Fix __git_ps1 to work with "set -u" | 30 June 2010, 18:55:37 UTC |
| 8b3120d | Junio C Hamano | 30 June 2010, 18:55:37 UTC | Merge branch 'mg/rev-parse-tests' * mg/rev-parse-tests: t6018: make sure all tested symbolic names are different revs t6018: add tests for rev-list's --branches and --tags | 30 June 2010, 18:55:37 UTC |
| e1165dd | Junio C Hamano | 30 June 2010, 18:55:37 UTC | Merge branch 'jl/maint-diff-ignore-submodules' * jl/maint-diff-ignore-submodules: t4027,4041: Use test -s to test for an empty file Add optional parameters to the diff option "--ignore-submodules" git diff: rename test that had a conflicting name | 30 June 2010, 18:55:37 UTC |
| 5671028 | Nazri Ramliy | 29 June 2010, 07:47:08 UTC | Add test for correct coloring of git log --decoration Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2010, 18:14:44 UTC |
| c9eaaab | Junio C Hamano | 29 June 2010, 18:24:36 UTC | Sync with 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 18:24:36 UTC |
| e0ef849 | Jonathan Nieder | 14 June 2010, 05:32:09 UTC | revert: do not rebuild argv on heap Set options in struct rev_info directly so we can reuse the arguments collected from parse_options without modification. This is just a cleanup; no noticeable change is intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 17:36:13 UTC |
| 65281b7 | Junio C Hamano | 29 June 2010, 17:20:53 UTC | Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin * commit 'v1.7.2-rc0~6^2': DWIM 'git show -5' to 'git show --do-walk -5' Documentation/SubmittingPatches: Fix typo in GMail section Documentation/config: describe status.submodulesummary This commit fixes one test in t3508 by making "cherry-pick -<num>" walk the history. A test update from Elijah Newren is squashed as an evil merge. | 29 June 2010, 17:22:55 UTC |
| a146392 | Junio C Hamano | 29 June 2010, 16:59:56 UTC | Git 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 16:59:56 UTC |
| 3183286 | Brandon Casey | 28 June 2010, 22:46:22 UTC | t/t9001: use egrep when regular expressions are involved Supplying backslashed, extended regular expressions to grep is not portable. Use egrep instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 16:31:48 UTC |
| b8a6610 | Michael J Gruber | 28 June 2010, 19:01:07 UTC | git-rev-parse.txt: Add more examples for caret and colon Several items in the caret, colon and friends section contain examples already. Make sure they all come with examples, and that examples come early so that they serve as a visual guide, as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 15:48:19 UTC |
| 1ba5c53 | Junio C Hamano | 29 June 2010, 00:42:26 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.7.1.1 notes: Initialise variable to appease gcc notes: check number of parameters to "git notes copy" | 29 June 2010, 00:42:26 UTC |
| edac188 | Junio C Hamano | 29 June 2010, 00:42:18 UTC | Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2010, 00:42:18 UTC |
| 54fcb21 | Junio C Hamano | 28 June 2010, 23:19:03 UTC | Merge branch 'tr/send-email-8bit' into maint * tr/send-email-8bit: send-email: ask about and declare 8bit mails | 28 June 2010, 23:19:03 UTC |
| d60ad81 | Junio C Hamano | 28 June 2010, 23:18:58 UTC | Merge branch 'pb/maint-perl-errmsg-no-dir' into maint * pb/maint-perl-errmsg-no-dir: Git.pm: better error message | 28 June 2010, 23:18:58 UTC |
| 339aec7 | Junio C Hamano | 28 June 2010, 23:18:43 UTC | Merge branch 'js/maint-am-rebase-invalid-author' into maint * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing | 28 June 2010, 23:18:43 UTC |
| 6c1c442 | Junio C Hamano | 28 June 2010, 23:18:15 UTC | Merge branch 'jc/maint-simpler-common-prefix' into maint * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes | 28 June 2010, 23:18:15 UTC |
| 54dc783 | Junio C Hamano | 28 June 2010, 23:18:02 UTC | Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal | 28 June 2010, 23:18:02 UTC |
| 89fe121 | Ramsay Jones | 21 June 2010, 18:52:29 UTC | notes: Initialise variable to appease gcc gcc version 3.4.4 thinks that the 'cmp' variable could be used while uninitialised and complains thus: notes.c: In function `write_each_non_note_until': notes.c:719: warning: 'cmp' might be used uninitialized in \ this function Note that gcc versions 4.1.2 and 4.4.0 do not issue this warning. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2010, 17:01:26 UTC |
| bbb1b8a | Jeff King | 28 June 2010, 08:59:07 UTC | notes: check number of parameters to "git notes copy" Otherwise we may segfault with too few parameters. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Bert Wesarg <Bert.Wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2010, 16:15:15 UTC |
| 078e9bc | Ramsay Jones | 23 June 2010, 19:47:02 UTC | msvc: Select the "fast" definition of the {get,put}_be32() macros On Intel machines, the msvc compiler defines the CPU architecture macros _M_IX86 and _M_X64 (equivalent to __i386__ and __x86_64__ respectively). Use these macros in the pre-processor expression to select the "fast" definition of the {get,put}_be32() macros. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2010, 04:59:32 UTC |
| 3f3abe3 | Michael J Gruber | 27 June 2010, 13:15:22 UTC | git-rev-parse.txt: Document ":path" specifier The empty treeish in ":path" means "index". This is actually a special case of the ":stage:path" syntax where it is documented, but mentioning it also together with "treeish:path" is helpful, so do it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 19:25:37 UTC |
| 492b107 | Junio C Hamano | 27 June 2010, 19:01:12 UTC | Git 1.7.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 19:16:06 UTC |
| cf4403a | Junio C Hamano | 27 June 2010, 19:07:55 UTC | Merge branch 'cp/textconv-cat-file' * cp/textconv-cat-file: git-cat-file.txt: Document --textconv t/t8007: test textconv support for cat-file textconv: support for cat_file sha1_name: add get_sha1_with_context() | 27 June 2010, 19:07:55 UTC |
| 6aa2064 | Junio C Hamano | 27 June 2010, 19:07:45 UTC | Merge branch 'pb/maint-perl-errmsg-no-dir' * pb/maint-perl-errmsg-no-dir: Git.pm: better error message | 27 June 2010, 19:07:45 UTC |
| a278aa6 | Junio C Hamano | 27 June 2010, 19:07:45 UTC | Merge branch 'tr/send-email-8bit' * tr/send-email-8bit: send-email: ask about and declare 8bit mails | 27 June 2010, 19:07:45 UTC |
| bcdfb20 | Junio C Hamano | 27 June 2010, 19:07:44 UTC | Merge branch 'js/maint-am-rebase-invalid-author' * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing | 27 June 2010, 19:07:44 UTC |
| 4af574d | Junio C Hamano | 27 June 2010, 19:07:44 UTC | Merge branch 'ab/blame-textconv' * ab/blame-textconv: t/t8006: test textconv support for blame textconv: support for blame textconv: make the API public Conflicts: diff.h | 27 June 2010, 19:07:44 UTC |
| a81f1a8 | Junio C Hamano | 27 June 2010, 19:07:44 UTC | Merge branch 'jn/show-num-walks' * jn/show-num-walks: DWIM 'git show -5' to 'git show --do-walk -5' | 27 June 2010, 19:07:44 UTC |
| 5266347 | Michael J Gruber | 14 May 2010, 18:26:51 UTC | t6018: make sure all tested symbolic names are different revs Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 18:32:43 UTC |
| 9332441 | Michael J Gruber | 14 May 2010, 18:26:50 UTC | t6018: add tests for rev-list's --branches and --tags so that we know when they break. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 18:32:43 UTC |
| 0c72cea | Julian Phillips | 25 June 2010, 23:41:39 UTC | Merge branch 'jp/string-list-api-cleanup' into jn/grep-open An evil merge to adjust the series to cleaned-up API. From: Julian Phillips <julian@quantumfyre.co.uk> Subject: [PATCH v2 7/7] grep: fix string_list_append calls Date: Sat, 26 Jun 2010 00:41:39 +0100 Message-ID: <20100625234140.18927.35025.julian@quantumfyre.co.uk> * jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:17:18 UTC |
| 1d2f80f | Julian Phillips | 25 June 2010, 23:41:38 UTC | string_list: Fix argument order for string_list_append Update the definition and callers of string_list_append to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:52 UTC |
| e8c8b71 | Julian Phillips | 25 June 2010, 23:41:37 UTC | string_list: Fix argument order for string_list_lookup Update the definition and callers of string_list_lookup to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:51 UTC |
| aadceea | Julian Phillips | 25 June 2010, 23:41:36 UTC | string_list: Fix argument order for string_list_insert_at_index Update the definition and callers of string_list_insert_at_index to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:51 UTC |
| 78a395d | Julian Phillips | 25 June 2010, 23:41:35 UTC | string_list: Fix argument order for string_list_insert Update the definition and callers of string_list_insert to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:51 UTC |
| b684e97 | Julian Phillips | 25 June 2010, 23:41:34 UTC | string_list: Fix argument order for for_each_string_list Update the definition and callers of for_each_string_list to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:51 UTC |
| cb944f6 | Julian Phillips | 25 June 2010, 23:41:33 UTC | string_list: Fix argument order for print_string_list Update the definition and callers of print_string_list to use the string_list as the first argument. This helps make the API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2010, 17:06:40 UTC |
| f526d12 | Junio C Hamano | 25 June 2010, 18:45:27 UTC | Merge branch 'maint' * maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings | 25 June 2010, 18:45:27 UTC |
| 46a958b | Jens Lehmann | 25 June 2010, 14:56:47 UTC | Add the option "--ignore-submodules" to "git status" In some use cases it is not desirable that "git status" considers submodules that only contain untracked content as dirty. This may happen e.g. when the submodule is not under the developers control and not all build generated files have been added to .gitignore by the upstream developers. Using the "untracked" parameter for the "--ignore-submodules" option disables checking for untracked content and lets git diff report them as changed only when they have new commits or modified content. Sometimes it is not wanted to have submodules show up as changed when they just contain changes to their work tree (this was the behavior before 1.7.0). An example for that are scripts which just want to check for submodule commits while ignoring any changes to the work tree. Also users having large submodules known not to change might want to use this option, as the - sometimes substantial - time it takes to scan the submodule work tree(s) is saved when using the "dirty" parameter. And if you want to ignore any changes to submodules, you can now do that by using this option without parameters or with "all" (when the config option status.submodulesummary is set, using "all" will also suppress the output of the submodule summary). A new function handle_ignore_submodules_arg() is introduced to parse this option new to "git status" in a single location, as "git diff" already knew it. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 18:30:25 UTC |
| 1807650 | Jens Lehmann | 25 June 2010, 14:56:02 UTC | git submodule: ignore dirty submodules for summary and status The summary and status commands only care about submodule commits, so it is rather pointless that they check for dirty work trees. This saves the time needed to scan the submodules work tree. Even "git status" profits from these savings when the status.submodulesummary config option is set, as this lead to traversing the submodule work trees twice, once for status and once again for the submodule summary. And if the submodule was just dirty, submodule summary produced rather meaningless output anyway: * sub 1234567...1234567 (0): Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 18:12:27 UTC |
| 9eafa12 | Ramsay Jones | 23 June 2010, 19:47:50 UTC | msvc: Fix some compiler warnings In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data Note that gcc issues a similar complaint about line 244 when compiling with -Wextra. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 18:04:16 UTC |
| 6ed7dda | Brian Gernhardt | 25 June 2010, 17:20:48 UTC | t4027,4041: Use test -s to test for an empty file The tests used a mixture of 'echo -n' (which is non-portable) and either test_cmp or diff to check if a file is empty. The much easier and portable method to check for an empty file is '! test -s' While we're in t4027, there was an excess test_done. Remove it. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 17:54:04 UTC |
| 8b6d792 | Christian Couder | 25 June 2010, 02:16:24 UTC | Documentation: grep: fix asciidoc problem with -- Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "\--" will properly appear as "--". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 15:57:17 UTC |
| f873a27 | Christian Couder | 14 June 2010, 05:29:38 UTC | revert: accept arbitrary rev-list options This can be useful to do something like: git rev-list --reverse master -- README | git cherry-pick -n --stdin without using xargs. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2010, 15:55:48 UTC |
| 3c73a1d | Junio C Hamano | 24 June 2010, 20:36:30 UTC | url_decode: URL scheme ends with a colon and does not require a slash Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 20:36:30 UTC |
| 9f77fe0 | Michael J Gruber | 24 June 2010, 12:56:55 UTC | git-cat-file.txt: Document --textconv Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 20:10:59 UTC |
| 5e11bee | Nazri Ramliy | 24 June 2010, 00:21:16 UTC | Allow customizable commit decorations colors Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 19:57:34 UTC |
| 6d158cb | Andrew Sayers | 17 June 2010, 21:32:02 UTC | bash completion: Support "divergence from upstream" messages in __git_ps1 Add a notification in the command prompt specifying whether (and optionally how far) your branch has diverged from its upstream. This is especially helpful in small teams that very frequently (forget to) push to each other. Support git-svn upstream detection as a special case, as migrators from centralised version control systems are especially likely to forget to push. Support for other types of upstream than SVN should be easy to add if anyone is so inclined. Signed-off-by: Andrew Sayers <andrew-git@pileofstuff.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 17:02:45 UTC |
| 4e0d7a8 | Ramsay Jones | 23 June 2010, 19:40:19 UTC | msvc: Fix some "expr evaluates to function" compiler warnings In particular, the following warning is issued while compiling notes.c: notes.c(927) : warning C4550: expression evaluates to a \ function which is missing an argument list along with identical warnings on lines 928, 1016 and 1017. In order to suppress the warning, we change the definition of combine_notes_fn, so that the symbol type is an (explicit) "pointer to function ...". As a result, several other declarations need some minor fix-up to take account of the new typedef. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2010, 16:42:12 UTC |
| ba4d01b | Junio C Hamano | 23 June 2010, 17:43:28 UTC | Merge branch 'jk/url-decode' * jk/url-decode: url.c: "<scheme>://" part at the beginning should not be URL decoded | 23 June 2010, 17:43:28 UTC |
| ce83eda | Junio C Hamano | 23 June 2010, 17:27:39 UTC | url.c: "<scheme>://" part at the beginning should not be URL decoded When using the protocol git+ssh:// for example we do not want to decode the '+' as a space. The url decoding must take place only for the server name and parameters. This fixes a regression introduced in 9d2e942. Initial-fix-by: Pascal Obry <pascal.obry@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 June 2010, 17:42:07 UTC |
| 6f426c7 | Junio C Hamano | 22 June 2010, 17:03:04 UTC | Update draft release notes to 1.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2010, 17:03:04 UTC |
| 2c177a1 | Junio C Hamano | 22 June 2010, 16:45:23 UTC | Merge branch 'jc/maint-simpler-common-prefix' * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes | 22 June 2010, 16:45:23 UTC |
| 6bead0c | Junio C Hamano | 22 June 2010, 16:45:22 UTC | Merge branch 'sb/format-patch-signature' * sb/format-patch-signature: completion: Add --signature and format.signature format-patch: Add a signature option (--signature) | 22 June 2010, 16:45:22 UTC |
| 223a923 | Junio C Hamano | 22 June 2010, 16:45:22 UTC | Merge branch 'mg/pretty-magic-space' * mg/pretty-magic-space: pretty: Introduce ' ' modifier to add space if non-empty Conflicts: pretty.c | 22 June 2010, 16:45:22 UTC |
| 5bfd536 | Junio C Hamano | 22 June 2010, 16:45:22 UTC | Merge branch 'jn/gitweb-return-or-exit-cleanup' * jn/gitweb-return-or-exit-cleanup: gitweb: Return or exit after done serving request Conflicts: gitweb/gitweb.perl | 22 June 2010, 16:45:22 UTC |
| 3919d40 | Junio C Hamano | 22 June 2010, 16:45:22 UTC | Merge branch 'bd/maint-unpack-trees-parawalk-fix' * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal | 22 June 2010, 16:45:22 UTC |
| 8c7da86 | Junio C Hamano | 22 June 2010, 16:45:21 UTC | Merge branch 'cc/cherry-pick-series' * cc/cherry-pick-series: Documentation/revert: describe passing more than one commit Documentation/cherry-pick: describe passing more than one commit revert: add tests to check cherry-picking many commits revert: allow cherry-picking more than one commit revert: change help_msg() to take no argument revert: refactor code into a do_pick_commit() function revert: use run_command_v_opt() instead of execv_git_cmd() revert: cleanup code for -x option | 22 June 2010, 16:45:21 UTC |
| a214afd | Junio C Hamano | 22 June 2010, 16:45:21 UTC | Merge branch 'jc/rev-list-ancestry-path' * jc/rev-list-ancestry-path: revision: Turn off history simplification in --ancestry-path mode revision: Fix typo in --ancestry-path error message Documentation/rev-list-options.txt: Explain --ancestry-path Documentation/rev-list-options.txt: Fix missing line in example history graph revision: --ancestry-path | 22 June 2010, 16:45:21 UTC |
| 13cbf01 | Junio C Hamano | 22 June 2010, 16:45:21 UTC | Merge branch 'lt/extended-sha1-match-commit-with-regexp' * lt/extended-sha1-match-commit-with-regexp: Make :/ accept a regex rather than a fixed pattern | 22 June 2010, 16:45:21 UTC |
| 262657d | Junio C Hamano | 22 June 2010, 16:35:36 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.7.1.1 tests: remove unnecessary '^' from 'expr' regular expression Conflicts: diff.c | 22 June 2010, 16:35:36 UTC |
| a4c2454 | Junio C Hamano | 22 June 2010, 16:18:55 UTC | Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2010, 16:33:03 UTC |
| b2ebbd8 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'ic/maint-rebase-i-abort' into maint * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out | 22 June 2010, 16:31:48 UTC |
| 81b43b5 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'cc/maint-commit-reflog-msg' into maint * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message | 22 June 2010, 16:31:48 UTC |
| abd3fd3 | Junio C Hamano | 22 June 2010, 16:31:48 UTC | Merge branch 'jk/maint-advice-empty-amend' into maint * jk/maint-advice-empty-amend: commit: give advice on empty amend | 22 June 2010, 16:31:48 UTC |
| b2a6095 | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'tc/commit-abbrev-fix' into maint * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output | 22 June 2010, 16:31:47 UTC |
| a7e664f | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'jn/document-rebase-i-p-limitation' into maint * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings | 22 June 2010, 16:31:47 UTC |
| 12575b7 | Junio C Hamano | 22 June 2010, 16:31:47 UTC | Merge branch 'jn/checkout-doc' into maint * jn/checkout-doc: Documentation/checkout: clarify description Documentation/checkout: clarify description | 22 June 2010, 16:31:47 UTC |
| 3c65689 | Junio C Hamano | 22 June 2010, 16:04:14 UTC | Merge branch 'cc/maint-diff-CC-binary' into maint * cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c | 22 June 2010, 16:27:07 UTC |
| a8c4d92 | Junio C Hamano | 22 June 2010, 15:31:53 UTC | Merge branch 'jc/t9129-any-utf8' into maint * jc/t9129-any-utf8: t9129: fix UTF-8 locale detection | 22 June 2010, 15:31:53 UTC |
| 4b2405c | Junio C Hamano | 22 June 2010, 15:31:46 UTC | Merge branch 'cb/ls-files-cdup' into maint * cb/ls-files-cdup: ls-files: allow relative pathspec quote.c: separate quoting and relative path generation | 22 June 2010, 15:31:46 UTC |
| e3ed7f7 | Junio C Hamano | 22 June 2010, 15:31:25 UTC | Merge branch 'tc/merge-m-log' into maint * tc/merge-m-log: merge: --log appends shortlog to message if specified fmt-merge-msg: add function to append shortlog only fmt-merge-msg: refactor merge title formatting fmt-merge-msg: minor refactor of fmt_merge_msg() merge: rename variable merge: update comment t7604-merge-custom-message: show that --log doesn't append to -m t7604-merge-custom-message: shift expected output creation | 22 June 2010, 15:31:25 UTC |
| 958ff4a | Junio C Hamano | 22 June 2010, 15:31:20 UTC | Merge branch 'ph/clone-message-reword' into maint * ph/clone-message-reword: clone: reword messages to match the end-user perception | 22 June 2010, 15:31:20 UTC |
| 0d2416e | Junio C Hamano | 22 June 2010, 15:30:44 UTC | Merge branch 'jn/maint-amend-missing-name' into maint * jn/maint-amend-missing-name: commit --amend: cope with missing display name | 22 June 2010, 15:30:44 UTC |
| 21919d3 | Junio C Hamano | 22 June 2010, 15:30:38 UTC | Merge branch 'pc/remove-warn' into maint * pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function | 22 June 2010, 15:30:38 UTC |
| e0ae1e6 | Junio C Hamano | 21 June 2010, 18:18:54 UTC | tests: remove unnecessary '^' from 'expr' regular expression As Brandon noticed, a regular expression match given to 'expr' is already anchored at the beginning. Some versions of expr even complain about this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 18:18:54 UTC |
| 7f5329f | Brandon Casey | 21 June 2010, 17:37:15 UTC | t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script The fake "less" script was already created in a previous test titled 'setup: fake "less"', so it is redundant. Additionally, it is broken since the redirection of 'cat' is to a file named 'less', but the chmod operates on the file named by the $less variable which may not contain the value 'less'. So, just remove this code, and rely on the creation of the fake "less" script performed earlier within the test script. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 18:12:21 UTC |
| 6a1b3fc | Brandon Casey | 21 June 2010, 17:37:14 UTC | t/t7811-grep-open.sh: ensure fake "less" is made executable The fake "less" script was not being made executable. This can cause the tests that follow to fail. This failure is not apparent on platforms which have DEFAULT_PAGER set to the string "less", since lib-pager.sh will have set the $less variable to "less" and the SIMPLEPAGER prerequisite will have been set, and so the "less" script will have already been created properly and made executable in test 2 'git grep -O'. On platforms which set DEFAULT_PAGER to something like "more", no such script will have been previously created, and tests 7 and 8 will fail. So, add a call to chmod to make the fake "less" script executable. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 18:11:48 UTC |
| 832ac79 | Brandon Casey | 21 June 2010, 17:37:13 UTC | t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression Regular expressions matched by 'expr' have an implicit '^' at the beginning of them and so are anchored to the beginning of the string. Using the '^' character to mean "match at the beginning", is redundant and could produce the wrong result if 'expr' implementations interpret the '^' as a literal '^'. Additionally, GNU expr 5.97 complains like this: expr: warning: unportable BRE: `^[a-z][a-z]*$': using `^' as the first character of the basic regular expression is not portable; it is being ignored Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2010, 18:11:11 UTC |
| 6df2ffa | Junio C Hamano | 21 June 2010, 13:02:50 UTC | Merge branch 'js/maint-receive-pack-symref-alias' * js/maint-receive-pack-symref-alias: | 21 June 2010, 13:02:50 UTC |
| 6cd52ed | Junio C Hamano | 21 June 2010, 13:02:50 UTC | Merge branch 'cc/maint-commit-reflog-msg' * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message | 21 June 2010, 13:02:50 UTC |
| 9cb16a9 | Junio C Hamano | 21 June 2010, 13:02:50 UTC | Merge branch 'ic/maint-rebase-i-abort' * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out | 21 June 2010, 13:02:50 UTC |
| 542ed78 | Junio C Hamano | 21 June 2010, 13:02:49 UTC | Merge branch 'jk/maint-advice-empty-amend' * jk/maint-advice-empty-amend: commit: give advice on empty amend | 21 June 2010, 13:02:49 UTC |
| d5cff17 | Junio C Hamano | 21 June 2010, 13:02:49 UTC | Merge branch 'eb/core-eol' * eb/core-eol: Add "core.eol" config variable Rename the "crlf" attribute "text" Add per-repository eol normalization Add tests for per-repository eol normalization Conflicts: Documentation/config.txt Makefile | 21 June 2010, 13:02:49 UTC |
| d249515 | Junio C Hamano | 21 June 2010, 13:02:47 UTC | Merge branch 'fg/autocrlf' * fg/autocrlf: autocrlf: Make it work also for un-normalized repositories | 21 June 2010, 13:02:47 UTC |
| 1623191 | Junio C Hamano | 21 June 2010, 13:02:47 UTC | Merge branch 'sm/branch-broken-ref' * sm/branch-broken-ref: branch: don't fail listing branches if one of the commits wasn't found branch: exit status now reflects if branch listing finds an error | 21 June 2010, 13:02:47 UTC |
| 8718e87 | Junio C Hamano | 21 June 2010, 13:02:47 UTC | Merge branch 'rr/parse-date-refactor' * rr/parse-date-refactor: Refactor parse_date for approxidate functions | 21 June 2010, 13:02:47 UTC |
| d4f8f74 | Junio C Hamano | 21 June 2010, 13:02:47 UTC | Merge branch 'jn/document-rebase-i-p-limitation' * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings | 21 June 2010, 13:02:47 UTC |
| 1a5296c | Junio C Hamano | 21 June 2010, 13:02:46 UTC | Merge branch 'tc/commit-abbrev-fix' * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output | 21 June 2010, 13:02:46 UTC |
| cecff3a | Junio C Hamano | 21 June 2010, 13:02:46 UTC | Merge branch 'tr/receive-pack-aliased-update-fix' * tr/receive-pack-aliased-update-fix: check_aliased_update: strcpy() instead of strcat() to copy | 21 June 2010, 13:02:46 UTC |
