gitweb.git
cat-file: use streaming API to print blobsNguyễn Thái Ngọc Duy Wed, 7 Mar 2012 10:54:17 +0000 (17:54 +0700)

cat-file: use streaming API to print blobs

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add more large blob test casesNguyễn Thái Ngọc Duy Wed, 7 Mar 2012 10:54:16 +0000 (17:54 +0700)

Add more large blob test cases

New test cases list commands that should work when memory is
limited. All memory allocation functions (*) learn to reject any
allocation larger than $GIT_ALLOC_LIMIT if set.

(*) Not exactly all. Some places do not use x* functions, but
malloc/calloc directly, notably diff-delta. These code path should
never be run on large blobs.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

streaming: make streaming-write-entry to be more reusableJunio C Hamano Wed, 7 Mar 2012 10:54:15 +0000 (17:54 +0700)

streaming: make streaming-write-entry to be more reusable

The static function in entry.c takes a cache entry and streams its blob
contents to a file in the working tree. Refactor the logic to a new API
function stream_blob_to_fd() that takes an object name and an open file
descriptor, so that it can be reused by other callers.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.7.9.3Junio C Hamano Mon, 5 Mar 2012 22:29:50 +0000 (14:29 -0800)

Sync with 1.7.9.3

Git 1.7.9.3 v1.7.9.3Junio C Hamano Mon, 5 Mar 2012 22:29:07 +0000 (14:29 -0800)

Git 1.7.9.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/doc-merge-options' into maintJunio C Hamano Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800)

Merge branch 'jc/doc-merge-options' into maint

* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together

Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano Mon, 5 Mar 2012 22:27:36 +0000 (14:27 -0800)

Merge branch 'cn/maint-rev-list-doc' into maint

* cn/maint-rev-list-doc:
Documentation: use {asterisk} in rev-list-options.txt when needed

fsck doc: a minor typofixJunio C Hamano Mon, 5 Mar 2012 19:32:08 +0000 (11:32 -0800)

fsck doc: a minor typofix

Reword the misspelled "squelch" noticed by Hermann Gaustere to say
"omit", which would sit better anyway.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

fast-import: zero all of 'struct tag' to silence valgrindThomas Rast Mon, 5 Mar 2012 13:48:49 +0000 (14:48 +0100)

fast-import: zero all of 'struct tag' to silence valgrind

When running t9300, valgrind (correctly) complains about an
uninitialized value in write_crash_report:

==2971== Use of uninitialised value of size 8
==2971== at 0x4164F4: sha1_to_hex (hex.c:70)
==2971== by 0x4073E4: die_nicely (fast-import.c:468)
==2971== by 0x43284C: die (usage.c:86)
==2971== by 0x40420D: main (fast-import.c:2731)
==2971== Uninitialised value was created by a heap allocation
==2971== at 0x4C29B3D: malloc (vg_replace_malloc.c:263)
==2971== by 0x433645: xmalloc (wrapper.c:35)
==2971== by 0x405DF5: pool_alloc (fast-import.c:619)
==2971== by 0x407755: pool_calloc.constprop.14 (fast-import.c:634)
==2971== by 0x403F33: main (fast-import.c:3324)

Fix this by zeroing all of the 'struct tag'. We would only need to
zero out the 'sha1' field, but this way seems more future-proof.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.10Junio C Hamano Mon, 5 Mar 2012 07:38:02 +0000 (23:38 -0800)

Update draft release notes to 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/symbolic-ref-short'Junio C Hamano Mon, 5 Mar 2012 07:35:23 +0000 (23:35 -0800)

Merge branch 'jk/symbolic-ref-short'

* jk/symbolic-ref-short:
symbolic-ref --short: abbreviate the output unambiguously

Merge branch 'jn/gitweb-hilite-regions'Junio C Hamano Mon, 5 Mar 2012 07:35:18 +0000 (23:35 -0800)

Merge branch 'jn/gitweb-hilite-regions'

* jn/gitweb-hilite-regions:
gitweb: Highlight matched part of shortened project description
gitweb: Highlight matched part of project description when searching projects
gitweb: Highlight matched part of project name when searching projects
gitweb: Introduce esc_html_match_hl and esc_html_hl_regions

Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano Mon, 5 Mar 2012 07:35:12 +0000 (23:35 -0800)

Merge branch 'jc/am-3-nonstandard-popt'

* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option

Merge branch 'maint'Junio C Hamano Mon, 5 Mar 2012 06:21:52 +0000 (22:21 -0800)

Merge branch 'maint'

* maint:
Update draft release notes to 1.7.9.3 for the last time
http.proxy: also mention https_proxy and all_proxy
t0300: work around bug in dash 0.5.6
t5512 (ls-remote): modernize style
tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh

Update draft release notes to 1.7.9.3 for the last... Junio C Hamano Mon, 5 Mar 2012 06:21:30 +0000 (22:21 -0800)

Update draft release notes to 1.7.9.3 for the last time

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano Mon, 5 Mar 2012 06:17:52 +0000 (22:17 -0800)

Merge branch 'cn/maint-branch-with-bad' into maint

* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists

Conflicts:
t/t3200-branch.sh

Merge branch 'jn/maint-gitweb-invalid-regexp' into... Junio C Hamano Mon, 5 Mar 2012 06:17:47 +0000 (22:17 -0800)

Merge branch 'jn/maint-gitweb-invalid-regexp' into maint

* jn/maint-gitweb-invalid-regexp:
gitweb: Handle invalid regexp in regexp search

Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano Mon, 5 Mar 2012 06:17:41 +0000 (22:17 -0800)

Merge branch 'nd/maint-verify-objects' into maint

* nd/maint-verify-objects:
rev-list: fix --verify-objects --quiet becoming --objects
rev-list: remove BISECT_SHOW_TRIED flag

Merge branch 'jk/maint-avoid-streaming-filtered-content... Junio C Hamano Mon, 5 Mar 2012 06:16:40 +0000 (22:16 -0800)

Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint

* 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

Merge branch 'jb/filter-ignore-sigpipe' into maintJunio C Hamano Mon, 5 Mar 2012 06:16:35 +0000 (22:16 -0800)

Merge branch 'jb/filter-ignore-sigpipe' into maint

* jb/filter-ignore-sigpipe:
Ignore SIGPIPE when running a filter driver

Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano Mon, 5 Mar 2012 06:16:33 +0000 (22:16 -0800)

Merge branch 'sp/smart-http-failure-to-push' into maint

* 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

Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano Mon, 5 Mar 2012 06:16:30 +0000 (22:16 -0800)

Merge branch 'tr/maint-bundle-long-subject' into maint

* 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

http.proxy: also mention https_proxy and all_proxyClemens Buchacher Sun, 4 Mar 2012 16:50:43 +0000 (17:50 +0100)

http.proxy: also mention https_proxy and all_proxy

The current wording of the http.proxy documentation suggests that
http_proxy is somehow equivalent to http.proxy. However, while
http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the
proxy for both HTTP and HTTPS protocols, the http_proxy environment
variable is used only for HTTP. But since the docs mention only
http_proxy, a user might expect it to apply to all HTTP-like protocols.

Avoid any such misunderstanding by explicitly mentioning https_proxy and
all_proxy as well.

Also replace linkgit:curl[1] with a literal 'curl(1)', because the
former gets translated to a dead link in the HTML pages.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

parse-options: typo check for unknown switchesRené Scharfe Sat, 3 Mar 2012 11:00:29 +0000 (12:00 +0100)

parse-options: typo check for unknown switches

The user specifies a long option but forgets to type the second
leading dash, we currently detect and report that fact if its first
letter is a valid short option. This is done for safety, to avoid
ambiguity between short options (and their arguments) and a long
option with a missing dash.

This diagnostic message is also helpful for long options whose first
letter is not a valid short option, however. Print it in that case,
too, as a courtesy.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t0300: work around bug in dash 0.5.6Michael J Gruber Sat, 3 Mar 2012 00:37:35 +0000 (19:37 -0500)

t0300: work around bug in dash 0.5.6

The construct 'while IFS== read' makes dash 0.5.6 execute
read without changing IFS, which results in test breakages
all over the place in t0300. Neither dash 0.5.5.1 and older
nor dash 0.5.7 and newer are affected: The problem was
introduded resp. fixed by the commits

55c46b7 ([BUILTIN] Honor tab as IFS whitespace when
splitting fields in readcmd, 2009-08-11)

1d806ac ([VAR] Do not poplocalvars prematurely on regular
utilities, 2010-05-27)

in http://git.kernel.org/?p=utils/dash/dash.git

Putting 'IFS==' before that line makes all versions of dash
work.

This looks like a dash bug, not a misinterpretation of the
standard. However, it's worth working around for two
reasons. One, this version of dash was released in Fedora
14-16, so the bug is found in the wild. And two, at least
one other shell, Solaris /bin/sh, choked on this by
persisting IFS after the read invocation. That is not a
shell we usually care about, and I think this use of IFS is
acceptable by POSIX (which allows other behavior near
"special builtins", but "read" is not one of those). But it
seems that this may be a subtle, not-well-tested case for
some shells. Given that the workaround is so simple, it's
worth just being defensive.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5512 (ls-remote): modernize styleTom Grennan Sat, 3 Mar 2012 02:15:34 +0000 (18:15 -0800)

t5512 (ls-remote): modernize style

Prepare expected output inside test_expect_success that uses it.
Also remove excess blank lines.

Signed-off-by: Tom Grennan <tmgrennan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Fix passing parameters to git_project_search_formJakub Narebski Fri, 2 Mar 2012 22:50:01 +0000 (23:50 +0100)

gitweb: Fix passing parameters to git_project_search_form

The git_project_search_form() subroutine, introduced in a1e1b2d
(gitweb: improve usability of projects search form, 2012-01-31) didn't
get its arguments from caller correctly. Gitweb worked correctly
thanks to sticky-ness of form fields in CGI.pm... but it make UTF-8
fix for project search not working.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: fix spurious error when run directly with Solari... Stefano Lattarini Fri, 2 Mar 2012 18:48:36 +0000 (19:48 +0100)

tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh

If any test script is run directly with Solaris 10 /usr/xpg4/bin/sh or
/bin/ksh, it fails spuriously with a message like:

t0000-basic.sh[31]: unset: bad argument count

This happens because those shells bail out when encountering a call to
"unset" with no arguments, and such unset call could take place in
'test-lib.sh'. Fix that issue, and add a proper comment to ensure we
don't regress in this respect.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.10Junio C Hamano Fri, 2 Mar 2012 05:08:07 +0000 (21:08 -0800)

Update draft release notes to 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Fri, 2 Mar 2012 19:49:06 +0000 (11:49 -0800)

Merge branch 'maint'

* maint:
Documentation: do not assume that n > 1 in <rev>~$n

Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano Wed, 29 Feb 2012 19:13:22 +0000 (11:13 -0800)

Documentation: do not assume that n > 1 in <rev>~$n

We explained <rev>~<n> as <n>th generation grand-parent, but a reader got
confused by the "grand-" part when <n> is 1.

Reword it with "ancestor"; with the "generation" and "following only the
first parents" around there, what we try to describe should be clear
enough now.

Noticed-by: Luke Diamand <luke@diamand.org>
Helped-by: Thomas Rast <trast@inf.ethz.ch>
Helped-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano Fri, 2 Mar 2012 04:59:41 +0000 (20:59 -0800)

Merge branch 'cb/fsck-squelch-dangling'

* cb/fsck-squelch-dangling:
fsck: --no-dangling omits "dangling object" information

Merge branch 'rs/no-no-no-parseopt'Junio C Hamano Fri, 2 Mar 2012 04:59:31 +0000 (20:59 -0800)

Merge branch 'rs/no-no-no-parseopt'

* rs/no-no-no-parseopt:
parse-options: remove PARSE_OPT_NEGHELP
parse-options: allow positivation of options starting, with no-
test-parse-options: convert to OPT_BOOL()

Conflicts:
builtin/grep.c

Merge branch 'th/git-diffall'Junio C Hamano Fri, 2 Mar 2012 04:59:25 +0000 (20:59 -0800)

Merge branch 'th/git-diffall'

* th/git-diffall:
contrib: add git-diffall script

Merge the initial l10n effort inJunio C Hamano Fri, 2 Mar 2012 04:52:03 +0000 (20:52 -0800)

Merge the initial l10n effort in

* 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

Merge branch 'master' of https://github.com/git-l10n... Junio C Hamano Fri, 2 Mar 2012 04:51:37 +0000 (20:51 -0800)

Merge branch 'master' of https://github.com/git-l10n/git-po into l10n

* 'master' of https://github.com/git-l10n/git-po:
l10n: leave leading space unchanged for zh_CN.po

Update l10n guide: change the repository URL, etcJiang Xin Fri, 2 Mar 2012 02:29:53 +0000 (10:29 +0800)

Update l10n guide: change the repository URL, etc

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>

Merge branch 'maint'Junio C Hamano Thu, 1 Mar 2012 22:45:14 +0000 (14:45 -0800)

Merge branch 'maint'

* maint:
Documentation fixes in git-config

Merge branch 'nd/maint-verify-objects'Junio C Hamano Thu, 1 Mar 2012 22:44:42 +0000 (14:44 -0800)

Merge branch 'nd/maint-verify-objects'

* nd/maint-verify-objects:
rev-list: fix --verify-objects --quiet becoming --objects
rev-list: remove BISECT_SHOW_TRIED flag

Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano Thu, 1 Mar 2012 22:44:38 +0000 (14:44 -0800)

Merge branch 'jn/maint-gitweb-invalid-regexp'

* jn/maint-gitweb-invalid-regexp:
gitweb: Handle invalid regexp in regexp search

Merge branch 'cn/maint-rev-list-doc'Junio C Hamano Thu, 1 Mar 2012 22:44:28 +0000 (14:44 -0800)

Merge branch 'cn/maint-rev-list-doc'

* cn/maint-rev-list-doc:
Documentation: use {asterisk} in rev-list-options.txt when needed

Merge branch 'cn/maint-branch-with-bad'Junio C Hamano Thu, 1 Mar 2012 22:44:17 +0000 (14:44 -0800)

Merge branch 'cn/maint-branch-with-bad'

* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists

Conflicts:
t/t3200-branch.sh

Documentation fixes in git-configLibor Pechacek Thu, 1 Mar 2012 10:59:45 +0000 (11:59 +0100)

Documentation fixes in git-config

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>

l10n: leave leading space unchanged for zh_CN.pows3389 Wed, 29 Feb 2012 12:53:26 +0000 (20:53 +0800)

l10n: leave leading space unchanged for zh_CN.po

Signed-off-by: ws3389 <willsmith3389@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Update l10n guideJunio C Hamano Wed, 29 Feb 2012 08:10:30 +0000 (00:10 -0800)

Update l10n guide

Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck: --no-dangling omits "dangling object" informationJunio C Hamano Tue, 28 Feb 2012 22:55:39 +0000 (14:55 -0800)

fsck: --no-dangling omits "dangling object" information

The default output from "fsck" is often overwhelmed by informational
message on dangling objects, especially if you do not repack often, and a
real error can easily be buried.

Add "--no-dangling" option to omit them, and update the user manual to
demonstrate its use.

Based on a patch by Clemens Buchacher, but reverted the part to change
the default to --no-dangling, which is unsuitable for the first patch.
The usual three-step procedure to break the backward compatibility over
time needs to happen on top of this, if we were to go in that direction.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.10Junio C Hamano Tue, 28 Feb 2012 21:31:05 +0000 (13:31 -0800)

Update draft release notes to 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'pj/completion-remote-set-url-branches'Junio C Hamano Tue, 28 Feb 2012 21:26:04 +0000 (13:26 -0800)

Merge branch 'pj/completion-remote-set-url-branches'

* pj/completion-remote-set-url-branches:
completion: normalize increment/decrement style
completion: remote set-* <name> and <branch>

Merge branch 'ph/cherry-pick-advice-refinement'Junio C Hamano Tue, 28 Feb 2012 21:26:01 +0000 (13:26 -0800)

Merge branch 'ph/cherry-pick-advice-refinement'

* ph/cherry-pick-advice-refinement:
cherry-pick: No advice to commit if --no-commit

Merge branch 'jb/required-filter'Junio C Hamano Tue, 28 Feb 2012 21:25:57 +0000 (13:25 -0800)

Merge branch 'jb/required-filter'

* jb/required-filter:
Add a setting to require a filter to be successful

Conflicts:
convert.c

Documentation: use {asterisk} in rev-list-options.txt... Carlos Martín Nieto Tue, 28 Feb 2012 15:35:48 +0000 (16:35 +0100)

Documentation: use {asterisk} in rev-list-options.txt when needed

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>

parse-options: remove PARSE_OPT_NEGHELPRené Scharfe Tue, 28 Feb 2012 19:06:09 +0000 (20:06 +0100)

parse-options: remove PARSE_OPT_NEGHELP

PARSE_OPT_NEGHELP is confusing because short options defined with that
flag do the opposite of what the helptext says. It is also not needed
anymore now that options starting with no- can be negated by removing
that prefix. Convert its only two users to OPT_NEGBIT() and OPT_BOOL()
and then remove support for PARSE_OPT_NEGHELP.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Handle invalid regexp in regexp searchJakub Narebski Tue, 28 Feb 2012 18:41:47 +0000 (19:41 +0100)

gitweb: Handle invalid regexp in regexp search

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>

rev-list: fix --verify-objects --quiet becoming --objectsNguyễn Thái Ngọc Duy Tue, 28 Feb 2012 14:00:00 +0000 (21:00 +0700)

rev-list: fix --verify-objects --quiet becoming --objects

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>

rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy Tue, 28 Feb 2012 13:59:59 +0000 (20:59 +0700)

rev-list: remove BISECT_SHOW_TRIED flag

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>

Merge pull request from jiangxin/masterJiang Xin Tue, 28 Feb 2012 16:40:07 +0000 (00:40 +0800)

Merge pull request from jiangxin/master

l10n: translation for Simplified Chinese.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: update Chinese translation to the new git.poJiang Xin Tue, 28 Feb 2012 04:24:54 +0000 (12:24 +0800)

l10n: update Chinese translation to the new git.po

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: Update git.pot (12 new messages)Jiang Xin Tue, 28 Feb 2012 04:24:20 +0000 (12:24 +0800)

l10n: Update git.pot (12 new messages)

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>

Merge branch 'master' into git-poJiang Xin Tue, 28 Feb 2012 04:23:26 +0000 (12:23 +0800)

Merge branch 'master' into git-po

symbolic-ref --short: abbreviate the output unambiguouslyJan Krüger Mon, 27 Feb 2012 22:10:38 +0000 (23:10 +0100)

symbolic-ref --short: abbreviate the output unambiguously

It can be helpful to resolve a symbolic ref and output the result in a
shortened form, such as for use in shell prompts. Add a "--short" option
to do so.

Signed-off-by: Jan Krüger <jk@jk.gs>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 27 Feb 2012 23:37:02 +0000 (15:37 -0800)

Merge branch 'maint'

* 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

Update draft release notes to 1.7.9.3Junio C Hamano Mon, 27 Feb 2012 23:36:08 +0000 (15:36 -0800)

Update draft release notes to 1.7.9.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'pj/remote-set-branches-usage-fix' into... Junio C Hamano Mon, 27 Feb 2012 23:33:33 +0000 (15:33 -0800)

Merge branch 'pj/remote-set-branches-usage-fix' into maint

* pj/remote-set-branches-usage-fix:
remote: fix set-branches usage and documentation

Conflicts:
builtin/remote.c

Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano Mon, 27 Feb 2012 23:33:26 +0000 (15:33 -0800)

Merge branch 'jn/gitweb-unborn-head' into maint

* jn/gitweb-unborn-head:
gitweb: Fix "heads" view when there is no current branch

Merge branch 'jn/ancient-meld-support' into maintJunio C Hamano Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800)

Merge branch 'jn/ancient-meld-support' into maint

* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support

Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800)

Merge branch 'tr/merge-edit-guidance' into maint

* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing

CodingGuidelines: do not use 'which' in shell scriptsTim Henigan Fri, 24 Feb 2012 23:12:58 +0000 (18:12 -0500)

CodingGuidelines: do not use 'which' in shell scripts

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>

CodingGuidelines: Add a note about spaces after redirectionTim Henigan Fri, 24 Feb 2012 23:12:57 +0000 (18:12 -0500)

CodingGuidelines: Add a note about spaces after redirection

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>

contrib: add git-diffall scriptTim Henigan Fri, 24 Feb 2012 19:48:57 +0000 (14:48 -0500)

contrib: add git-diffall script

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>

git-p4: missing she-bang line in t9804 confuses proveZbigniew Jędrzejewski-Szmek Mon, 27 Feb 2012 17:40:14 +0000 (18:40 +0100)

git-p4: missing she-bang line in t9804 confuses prove

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>

grep -P: add tests for matching ^ and $Michał Kiedrowicz Mon, 27 Feb 2012 16:45:49 +0000 (17:45 +0100)

grep -P: add tests for matching ^ and $

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>

branch: don't assume the merge filter ref existsCarlos Martín Nieto Mon, 27 Feb 2012 15:11:53 +0000 (16:11 +0100)

branch: don't assume the merge filter ref exists

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>

post-receive-email: match up $LOGBEGIN..$LOGEND pairs... Michael Haggerty Mon, 27 Feb 2012 18:34:10 +0000 (19:34 +0100)

post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

post-receive-email: remove unused variableMichael Haggerty Mon, 27 Feb 2012 18:34:09 +0000 (19:34 +0100)

post-receive-email: remove unused variable

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>

send-email: document the --smtp-debug optionZbigniew Jędrzejewski-Szmek Mon, 27 Feb 2012 16:22:53 +0000 (17:22 +0100)

send-email: document the --smtp-debug option

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>

l10n: fast-forward here is ff-only merge, not pushYichao Yu Thu, 2 Feb 2012 08:43:01 +0000 (03:43 -0500)

l10n: fast-forward here is ff-only merge, not push

Signed-off-by: Yichao Yu <yyc1992@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: update zh_CN translation for "Fetching %s"Riku Thu, 2 Feb 2012 08:40:12 +0000 (16:40 +0800)

l10n: update zh_CN translation for "Fetching %s"

Signed-off-by: Riku <lu.riku@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Update draft release notes to 1.7.10Junio C Hamano Mon, 27 Feb 2012 07:11:10 +0000 (23:11 -0800)

Update draft release notes to 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jn/gitweb-search-optim'Junio C Hamano Mon, 27 Feb 2012 07:05:56 +0000 (23:05 -0800)

Merge branch 'jn/gitweb-search-optim'

* 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

Merge branch 'tr/maint-bundle-long-subject'Junio C Hamano Mon, 27 Feb 2012 07:05:51 +0000 (23:05 -0800)

Merge branch 'tr/maint-bundle-long-subject'

* 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

Merge branch 'sp/smart-http-failure-to-push'Junio C Hamano Mon, 27 Feb 2012 07:05:48 +0000 (23:05 -0800)

Merge branch 'sp/smart-http-failure-to-push'

* 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

Merge branch 'fc/push-prune'Junio C Hamano Mon, 27 Feb 2012 07:05:45 +0000 (23:05 -0800)

Merge branch 'fc/push-prune'

* 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

Merge branch 'jc/doc-merge-options'Junio C Hamano Mon, 27 Feb 2012 07:05:42 +0000 (23:05 -0800)

Merge branch 'jc/doc-merge-options'

* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together

Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano Mon, 27 Feb 2012 07:05:38 +0000 (23:05 -0800)

Merge branch 'jk/maint-avoid-streaming-filtered-contents'

* 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

Merge branch 'jb/filter-ignore-sigpipe'Junio C Hamano Mon, 27 Feb 2012 07:05:31 +0000 (23:05 -0800)

Merge branch 'jb/filter-ignore-sigpipe'

* jb/filter-ignore-sigpipe:
Ignore SIGPIPE when running a filter driver

test: "am -3" can accept non-standard -p<num>Junio C Hamano Mon, 27 Feb 2012 07:00:47 +0000 (23:00 -0800)

test: "am -3" can accept non-standard -p<num>

This adds a test for the previous one to make sure that "am -3 -p0" can
read patches created with the --no-prefix option.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Highlight matched part of shortened project... Jakub Narebski Mon, 27 Feb 2012 01:55:22 +0000 (02:55 +0100)

gitweb: Highlight matched part of shortened project description

Previous commit make gitweb use esc_html_match_hl() to mark match in
the _whole_ description of a project when searching projects.

This commit makes gitweb highlight match in _shortened_ description,
based on match in whole description, using esc_html_match_hl_chopped()
subroutine.

If match is in removed (chopped) part, even partially, then trailing
"... " is highlighted.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Highlight matched part of project description... Jakub Narebski Mon, 27 Feb 2012 01:55:21 +0000 (02:55 +0100)

gitweb: Highlight matched part of project description when searching projects

Use esc_html_match_hl() from earlier commit to mark match in the
_whole_ description when searching projects.

Currently, with this commit, when searching projects there is always
shown full description of a project, and not a shortened one (like for
ordinary projects list view), even if the match is on project name and
not project description. Because we always show full description of a
project, and not possibly shortened name, there is no need for having
full description on mouseover via title attribute.

Showing full description when there is match on it is useful to avoid
situation where match is in shortened, invisible part. On the other
hand that makes project search different than projects list view; also
there can be problems with overly-long project descriptions.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Highlight matched part of project name when... Jakub Narebski Mon, 27 Feb 2012 01:55:20 +0000 (02:55 +0100)

gitweb: Highlight matched part of project name when searching projects

Use esc_html_match_hl() introduced in previous commit to escape HTML
and mark match, using span element with 'match' class. Currently only
the 'path' part (i.e. the project name) is highlighted; match might be
on the project description. Highlighting match in description is left
for next commit.

The code makes use of the fact that defined $search_regexp means that
there was search going on.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Introduce esc_html_match_hl and esc_html_hl_regionsJakub Narebski Mon, 27 Feb 2012 01:55:19 +0000 (02:55 +0100)

gitweb: Introduce esc_html_match_hl and esc_html_hl_regions

The esc_html_match_hl() subroutine added in this commit will be used
to highlight *all* matches of given regexp, using 'match' class.
Ultimately it is to be used in all match highlighting, starting
with project search, which does not have it yet.

It uses the esc_html_hl_regions() subroutine, which is meant to
highlight in a given string a list of regions (given as a list of
[ beg, end ] pairs of positions in string), using HTML <span> element
with given class. It could probably be used in other places that
do highlighting of part of ready line, like highlighting of changes
in a diff (diff refinement highlighting).

Implementation and enhancement notes:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Currently esc_html_hl_regions() subroutine doesn't accept any
parameters, like esc_html() does. We might want for example to
pass nbsp=>1 to it.

It can easily be done with the following code:

my %opts = grep { ref($_) ne "ARRAY" } @sel;
@sel = grep { ref($_) eq "ARRAY" } @sel;

This allow adding parameters after or before regions, e.g.:

esc_html_hl_regions("foo bar", "mark", [ 0, 3 ], -nbsp => 1);

* esc_html_hl_regions() escapes like esc_html(); if we wanted to
highlight with esc_path(), we could pass subroutine reference
to now named esc_gen_hl_regions().

esc_html_hl_regions("foo bar", "mark", \&esc_path, [ 0, 3 ]);

Note that this way we can handle -nbsp=>1 case automatically,
e.g.

esc_html_hl_regions("foo bar", "mark",
sub { esc_html(@_, -nbsp=>1) },
[ 0, 3 ]);

* Alternate solution for highlighting region of a string would be to
use the idea that strings are to be HTML-escaped, and references to
scalars are HTML (like in the idea for generic committags).

This would require modifying gitweb code or esc_html to get list of
fragments, e.g.:

esc_html(\'<span class="mark">', 'foo', \'</span>', ' bar',
{ -nbsp => 1 });

or

esc_html([\'<span class="mark">', 'foo', \'</span>', ' bar'],
-nbsp=>1);

esc_html_match_hl() could be then simple wrapper around "match
formatter", e.g.

esc_html([ render_match_hl($str, $regexp) ], -nbsp=>1);

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz Sat, 25 Feb 2012 08:16:09 +0000 (09:16 +0100)

pack-objects: Fix compilation with NO_PTHREDS

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>

Merge branch 'maint'Junio C Hamano Mon, 27 Feb 2012 01:13:07 +0000 (17:13 -0800)

Merge branch 'maint'

* maint:
Document accumulated fixes since 1.7.9.2
Git 1.7.8.5
grep -P: Fix matching ^ and $
am: don't infloop for an empty input file
rebase -m: only call "notes copy" when rewritten exists and is non-empty
git-p4: remove bash-ism in t9800
git-p4: remove bash-ism in t9809
git-p4: fix submit regression with clientSpec and subdir clone
git-p4: set useClientSpec variable on initial clone
Makefile: add thread-utils.h to LIB_H

Conflicts:
RelNotes
t/t9809-git-p4-client-view.sh

Document accumulated fixes since 1.7.9.2Junio C Hamano Mon, 27 Feb 2012 01:08:59 +0000 (17:08 -0800)

Document accumulated fixes since 1.7.9.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano Mon, 27 Feb 2012 01:06:23 +0000 (17:06 -0800)

Merge branch 'jc/add-refresh-unmerged' into maint

* jc/add-refresh-unmerged:
refresh_index: do not show unmerged path that is outside pathspec

Merge branch 'js/configure-libintl' into maintJunio C Hamano Mon, 27 Feb 2012 01:04:53 +0000 (17:04 -0800)

Merge branch 'js/configure-libintl' into maint

* js/configure-libintl:
configure: don't use -lintl when there is no gettext support

Sync with 1.7.8.5Junio C Hamano Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)

Sync with 1.7.8.5

Git 1.7.8.5 v1.7.8.5Junio C Hamano Mon, 27 Feb 2012 00:40:20 +0000 (16:40 -0800)

Git 1.7.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

grep -P: Fix matching ^ and $Michał Kiedrowicz Sat, 25 Feb 2012 09:24:28 +0000 (10:24 +0100)

grep -P: Fix matching ^ and $

When "git grep" is run with -P/--perl-regexp, it doesn't match ^ and $ at
the beginning/end of the line. This is because PCRE normally matches ^
and $ at the beginning/end of the whole text, not for each line, and "git
grep" passes a large chunk of text (possibly containing many lines) to
pcre_exec() and then splits the text into lines.

This makes "git grep -P" behave differently from "git grep -E" and also
from "grep -P" and "pcregrep":

$ cat file
a
b
$ git grep --no-index -P '^ ' file
$ git grep --no-index -E '^ ' file
file: b
$ grep -c -P '^ ' file
b
$ pcregrep -c '^ ' file
b

Reported-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

am: don't infloop for an empty input fileJim Meyering Sat, 25 Feb 2012 17:34:26 +0000 (18:34 +0100)

am: don't infloop for an empty input file

git-am.sh's check_patch_format function would attempt to preview
the patch to guess its format, but would go into an infinite loop
when the patch file happened to be empty. The solution: exit the
loop when "read" fails, not when the line var, "$l1" becomes empty.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -m: only call "notes copy" when rewritten exists... Andrew Wong Sat, 25 Feb 2012 04:31:22 +0000 (23:31 -0500)

rebase -m: only call "notes copy" when rewritten exists and is non-empty

This prevents a shell error complaining rebase-merge/rewritten doesn't exist.

Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>