summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-01Merge branch 'th/git-diffall'Libravatar Junio C Hamano2-0/+292
* th/git-diffall: contrib: add git-diffall script
2012-03-01Merge the initial l10n effort inLibravatar Junio C Hamano6-24/+7265
* l10n: Update l10n guide: change the repository URL, etc l10n: leave leading space unchanged for zh_CN.po Update l10n guide l10n: update Chinese translation to the new git.po l10n: Update git.pot (12 new messages) l10n: fast-forward here is ff-only merge, not push l10n: update zh_CN translation for "Fetching %s" l10n: po for zh_CN l10n: initial git.pot for 1.7.10 upcoming release
2012-03-01Merge branch 'master' of https://github.com/git-l10n/git-po into l10nLibravatar Junio C Hamano1-4/+4
* 'master' of https://github.com/git-l10n/git-po: l10n: leave leading space unchanged for zh_CN.po
2012-03-01Update l10n guide: change the repository URL, etcLibravatar Jiang Xin2-10/+16
Host the l10n coordinator repository in a dedicated github organization account "git-l10n", so that the team may have a more permanent home. Also add a hint about reference of TEAMS file for l10n contributors. Update TEAMS file with new zh_CN l10n team members and a repository URL. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01Merge branch 'maint'Libravatar Junio C Hamano2-7/+12
* maint: Documentation fixes in git-config
2012-03-01Merge branch 'nd/maint-verify-objects'Libravatar Junio C Hamano2-25/+18
* nd/maint-verify-objects: rev-list: fix --verify-objects --quiet becoming --objects rev-list: remove BISECT_SHOW_TRIED flag
2012-03-01Merge branch 'jn/maint-gitweb-invalid-regexp'Libravatar Junio C Hamano2-1/+20
* jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search
2012-03-01Merge branch 'cn/maint-rev-list-doc'Libravatar Junio C Hamano1-6/+6
* cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed
2012-03-01Merge branch 'cn/maint-branch-with-bad'Libravatar Junio C Hamano2-0/+8
* cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh
2012-03-01Documentation fixes in git-configLibravatar Libor Pechacek2-7/+12
Variable names must start with an alphabetic character, regexp config key matching has its limits, sentence grammar. Signed-off-by: Libor Pechacek <lpechacek@suse.cz> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01l10n: leave leading space unchanged for zh_CN.poLibravatar ws33891-4/+4
Signed-off-by: ws3389 <willsmith3389@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-29Update l10n guideLibravatar Junio C Hamano2-22/+94
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-28Update draft release notes to 1.7.10Libravatar Junio C Hamano1-1/+5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-28Merge branch 'pj/completion-remote-set-url-branches'Libravatar Junio C Hamano1-14/+18
* pj/completion-remote-set-url-branches: completion: normalize increment/decrement style completion: remote set-* <name> and <branch>
2012-02-28Merge branch 'ph/cherry-pick-advice-refinement'Libravatar Junio C Hamano2-6/+25
* ph/cherry-pick-advice-refinement: cherry-pick: No advice to commit if --no-commit
2012-02-28Merge branch 'jb/required-filter'Libravatar Junio C Hamano3-14/+92
* jb/required-filter: Add a setting to require a filter to be successful Conflicts: convert.c
2012-02-28Documentation: use {asterisk} in rev-list-options.txt when neededLibravatar Carlos Martín Nieto1-6/+6
Text between two '*' is emphasized in AsciiDoc and makes explanations in rev-list-options.txt on glob-related options very confusing, as the rendered text would be missing two asterisks and the text between them would be emphasized instead. Use '{asterisk}' where needed to make them show up as asterisks in the rendered text. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-28gitweb: Handle invalid regexp in regexp searchLibravatar Jakub Narebski2-1/+20
When using regexp search ('sr' parameter / $search_use_regexp variable is true), check first that regexp is valid. Without this patch we would get an error from Perl during search (if searching is performed by gitweb), or highlighting matches substring (if applicable), if user provided invalid regexp... which means broken HTML, with error page (including HTTP headers) generated after gitweb already produced some output. Add test that illustrates such error: for example for regexp "*\.git" we would get the following error: Quantifier follows nothing in regex; marked by <-- HERE in m/* <-- HERE \.git/ at /var/www/cgi-bin/gitweb.cgi line 3084. Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-28rev-list: fix --verify-objects --quiet becoming --objectsLibravatar Nguyễn Thái Ngọc Duy2-13/+17
When --quiet is specified, finish_object() is called instead of show_object(). The latter is in charge of --verify-objects and will be skipped if --quiet is specified. Move the code up to finish_object(). Also pass the quiet flag along and make it always call show_* functions to avoid similar problems in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-28rev-list: remove BISECT_SHOW_TRIED flagLibravatar Nguyễn Thái Ngọc Duy2-12/+1
Since c99f069 (bisect--helper: remove "--next-vars" option as it is now useless - 2009-04-21), this flag has always been off. Remove the flag and all related code. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-29Merge pull request from jiangxin/masterLibravatar Jiang Xin1-121/+181
l10n: translation for Simplified Chinese. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-28l10n: update Chinese translation to the new git.poLibravatar Jiang Xin1-121/+181
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-28l10n: Update git.pot (12 new messages)Libravatar Jiang Xin1-121/+184
Update file 'po/git.pot' to v1.7.9.2-315-g25a78 (Merge branch 'maint'), with 12 new string additions. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-28Merge branch 'master' into git-poLibravatar Jiang Xin201-1989/+4948
2012-02-27Merge branch 'maint'Libravatar Junio C Hamano3-4/+22
* maint: Update draft release notes to 1.7.9.3 CodingGuidelines: do not use 'which' in shell scripts CodingGuidelines: Add a note about spaces after redirection post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly post-receive-email: remove unused variable
2012-02-27Update draft release notes to 1.7.9.3Libravatar Junio C Hamano1-0/+7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27Merge branch 'pj/remote-set-branches-usage-fix' into maintLibravatar Junio C Hamano2-2/+2
* pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
2012-02-27Merge branch 'jn/gitweb-unborn-head' into maintLibravatar Junio C Hamano2-2/+11
* jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
2012-02-27Merge branch 'jn/ancient-meld-support' into maintLibravatar Junio C Hamano1-1/+1
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintLibravatar Junio C Hamano1-0/+10
* tr/merge-edit-guidance: merge: add instructions to the commit message when editing
2012-02-27CodingGuidelines: do not use 'which' in shell scriptsLibravatar Tim Henigan1-0/+5
During the code review of a recent patch, it was noted that shell scripts must not use 'which $cmd' to check the availability of the command $cmd. The output of the command is not machine parseable and its exit code is not reliable across platforms. It is better to use 'type' to accomplish this task. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27CodingGuidelines: Add a note about spaces after redirectionLibravatar Tim Henigan1-0/+7
During code review of some patches, it was noted that redirection operators should have space before, but no space after them. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27contrib: add git-diffall scriptLibravatar Tim Henigan2-0/+292
The 'git difftool' allows the user to view diffs using an external tool. It runs a separate instance of the tool for each file in the diff. This makes it tedious to review changes spanning multiple files. The 'git-diffall' script instead prepares temporary directories with the files to be compared and launches a single instance of the external diff tool to view them (i.e. a directory diff). The 'diff.tool' or 'merge.tool' configuration variable is used to specify which external tool is used. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27git-p4: missing she-bang line in t9804 confuses proveLibravatar Zbigniew Jędrzejewski-Szmek1-0/+2
Without the magic line, prove shows lots and lots of errors: % prove ./t9804-git-p4-label.sh ./t9804-git-p4-label.sh .. syntax error at ./t9804-git-p4-label.sh line 3, near ". ." ... When #!/bin/sh is added, tests are skipped (I have no p4d). Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27grep -P: add tests for matching ^ and $Libravatar Michał Kiedrowicz1-0/+23
Earlier, fba4f1 (grep -P: Fix matching ^ and $) fixed an ancient bug. Add some tests to protect the change from future breakages; a slightly broken version of this was a part of the originally submitted patch. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27branch: don't assume the merge filter ref existsLibravatar Carlos Martín Nieto2-0/+8
print_ref_list looks up the merge_filter_ref and assumes that a valid pointer is returned. When the object doesn't exist, it tries to dereference a NULL pointer. This can be the case when git branch --merged is given an argument that isn't a valid commit name. Check whether the lookup returns a NULL pointer and die with an error if it does. Add a test, while we're at it. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctlyLibravatar Michael Haggerty1-3/+3
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27post-receive-email: remove unused variableLibravatar Michael Haggerty1-1/+0
prep_for_email neither is passed a fourth argument nor uses it. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27send-email: document the --smtp-debug optionLibravatar Zbigniew Jędrzejewski-Szmek1-0/+4
The option was already shown in -h output, so it should be documented in the man page. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Suggested-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-27l10n: fast-forward here is ff-only merge, not pushLibravatar Yichao Yu1-1/+1
Signed-off-by: Yichao Yu <yyc1992@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-27l10n: update zh_CN translation for "Fetching %s"Libravatar Riku1-1/+1
Signed-off-by: Riku <lu.riku@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-26Update draft release notes to 1.7.10Libravatar Junio C Hamano1-6/+35
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-26Merge branch 'jn/gitweb-search-optim'Libravatar Junio C Hamano1-13/+53
* jn/gitweb-search-optim: gitweb: Faster project search gitweb: Option for filling only specified info in fill_project_list_info gitweb: Refactor checking if part of project info need filling
2012-02-26Merge branch 'tr/maint-bundle-long-subject'Libravatar Junio C Hamano5-51/+67
* tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments
2012-02-26Merge branch 'sp/smart-http-failure-to-push'Libravatar Junio C Hamano1-3/+10
* sp/smart-http-failure-to-push: : Mask SIGPIPE on the command channel going to a transport helper disconnect from remote helpers more gently Conflicts: transport-helper.c
2012-02-26Merge branch 'fc/push-prune'Libravatar Junio C Hamano7-40/+101
* fc/push-prune: push: add '--prune' option remote: refactor code into alloc_delete_ref() remote: reorganize check_pattern_match() remote: use a local variable in match_push_refs() Conflicts: builtin/push.c
2012-02-26Merge branch 'jc/doc-merge-options'Libravatar Junio C Hamano1-11/+11
* jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together
2012-02-26Merge branch 'jk/maint-avoid-streaming-filtered-contents'Libravatar Junio C Hamano4-9/+125
* jk/maint-avoid-streaming-filtered-contents: do not stream large files to pack when filters are in use teach dry-run convert_to_git not to require a src buffer teach convert_to_git a "dry run" mode
2012-02-26Merge branch 'jb/filter-ignore-sigpipe'Libravatar Junio C Hamano1-0/+5
* jb/filter-ignore-sigpipe: Ignore SIGPIPE when running a filter driver
2012-02-26pack-objects: Fix compilation with NO_PTHREDSLibravatar Michał Kiedrowicz1-1/+1
It looks like commit 99fb6e04 (pack-objects: convert to use parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but hasn't noticed that the 'arg' variable no longer is available. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 22:58:33 +0000