gitweb.git
http: support curl < 7.10.7Tom G. Christensen Tue, 3 Feb 2015 17:30:08 +0000 (18:30 +0100)

http: support curl < 7.10.7

Commit dd61399 introduced support for http proxies that require
authentication but it relies on the CURL_PROXYAUTH option which was
added in curl 7.10.7.
This makes sure proxy authentication is only enabled if libcurl can
support it.

Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http: support proxies that require authenticationNelson Benitez Leon Fri, 2 Mar 2012 13:55:57 +0000 (14:55 +0100)

http: support proxies that require authentication

When the proxy server specified by the http.proxy configuration or the
http_proxy environment variable requires authentication, git failed to
connect to the proxy, because we did not configure the cURL handle with
CURLOPT_PROXYAUTH.

When a proxy is in use, and you tell git that the proxy requires
authentication by having username in the http.proxy configuration, an
extra request needs to be made to the proxy to find out what
authentication method it supports, as this patch uses CURLAUTH_ANY to let
the library pick the most secure method supported by the proxy server.

The extra round-trip adds extra latency, but relieves the user from the
burden to configure a specific authentication method. If it becomes
problem, a later patch could add a configuration option to specify what
method to use, but let's start simple for the time being.

Signed-off-by: Nelson Benitez Leon <nbenitezl@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

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

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>

git-p4: remove bash-ism in t9800Pete Wyckoff Sun, 26 Feb 2012 15:37:27 +0000 (10:37 -0500)

git-p4: remove bash-ism in t9800

This works in both bash and dash:

$ bash -c 'VAR=1 env' | grep VAR
VAR=1
$ dash -c 'VAR=1 env' | grep VAR
VAR=1

But environment variables assigned this way are not necessarily propagated
through a function in POSIX compliant shells:

$ bash -c 'f() { "$@"
}; VAR=1 f "env"' | grep VAR
VAR=1
$ dash -c 'f() { "$@"
}; VAR=1 f "env"' | grep VAR

Fix constructs like this, in particular, setting variables through
test_must_fail.

Based-on-patch-by: Vitor Antunes <vitor.hda@gmail.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: remove bash-ism in t9809Pete Wyckoff Sun, 26 Feb 2012 15:37:26 +0000 (10:37 -0500)

git-p4: remove bash-ism in t9809

Plain old $# works to count the number of arguments in
either bash or dash, even if the arguments have spaces.

Based-on-patch-by: Vitor Antunes <vitor.hda@gmail.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: fix submit regression with clientSpec and subdi... Pete Wyckoff Sun, 26 Feb 2012 01:06:25 +0000 (20:06 -0500)

git-p4: fix submit regression with clientSpec and subdir clone

When the --use-client-spec is given to clone, and the clone
path is a subset of the full tree as specified in the client,
future submits will go to the wrong place.

Factor out getClientSpec() so both clone/sync and submit can
use it. Introduce getClientRoot() that is needed for the client
spec case, and use it instead of p4Where().

Test the five possible submit behaviors (add, modify, rename,
copy, delete).

Reported-by: Laurent Charrière <lcharriere@promptu.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: set useClientSpec variable on initial clonePete Wyckoff Sun, 26 Feb 2012 01:06:24 +0000 (20:06 -0500)

git-p4: set useClientSpec variable on initial clone

If --use-client-spec was given, set the matching configuration
variable. This is necessary to ensure that future submits
work properly.

The alternatives of requiring the user to set it, or providing
a command-line option on every submit, are error prone.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

parse-options: allow positivation of options starting... René Scharfe Sat, 25 Feb 2012 19:14:54 +0000 (20:14 +0100)

parse-options: allow positivation of options starting, with no-

Long options can be negated by adding no- right after the leading
two dashes. This is useful e.g. to override options set by aliases.

For options that are defined to start with no- already, this looks
a bit funny. Allow such options to also be negated by removing the
prefix.

The following thirteen options are affected:

apply --no-add
bisect--helper --no-checkout
checkout-index --no-create
clone --no-checkout --no-hardlinks
commit --no-verify --no-post-rewrite
format-patch --no-binary
hash-object --no-filters
read-tree --no-sparse-checkout
revert --no-commit
show-branch --no-name
update-ref --no-deref

The following five are NOT affected because they are defined with
PARSE_OPT_NONEG or the non-negated version is defined as well:

branch --no-merged
format-patch --no-stat --no-numbered
update-index --no-assume-unchanged --no-skip-worktree

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

test-parse-options: convert to OPT_BOOL()René Scharfe Sat, 25 Feb 2012 19:11:16 +0000 (20:11 +0100)

test-parse-options: convert to OPT_BOOL()

Introduce OPT_BOOL() to test-parse-options and add some tests for
these "true" boolean options. Rename OPT_BOOLEAN to OPT_COUNTUP and
OPTION_BOOLEAN to OPTION_COUNTUP as well.

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

Makefile: add thread-utils.h to LIB_HDmitry V. Levin Fri, 24 Feb 2012 23:42:42 +0000 (03:42 +0400)

Makefile: add thread-utils.h to LIB_H

Starting with commit v1.7.8-165-g0579f91, grep.h includes
thread-utils.h, so the latter has to be added to LIB_H.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

do not stream large files to pack when filters are... Jeff King Fri, 24 Feb 2012 22:10:17 +0000 (17:10 -0500)

do not stream large files to pack when filters are in use

Because git's object format requires us to specify the
number of bytes in the object in its header, we must know
the size before streaming a blob into the object database.
This is not a problem when adding a regular file, as we can
get the size from stat(). However, when filters are in use
(such as autocrlf, or the ident, filter, or eol
gitattributes), we have no idea what the ultimate size will
be.

The current code just punts on the whole issue and ignores
filter configuration entirely for files larger than
core.bigfilethreshold. This can generate confusing results
if you use filters for large binary files, as the filter
will suddenly stop working as the file goes over a certain
size. Rather than try to handle unknown input sizes with
streaming, this patch just turns off the streaming
optimization when filters are in use.

This has a slight performance regression in a very specific
case: if you have autocrlf on, but no gitattributes, a large
binary file will avoid the streaming code path because we
don't know beforehand whether it will need conversion or
not. But if you are handling large binary files, you should
be marking them as such via attributes (or at least not
using autocrlf, and instead marking your text files as
such). And the flip side is that if you have a large
_non_-binary file, there is a correctness improvement;
before we did not apply the conversion at all.

The first half of the new t1051 script covers these failures
on input. The second half tests the matching output code
paths. These already work correctly, and do not need any
adjustment.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

teach dry-run convert_to_git not to require a src bufferJeff King Fri, 24 Feb 2012 22:05:03 +0000 (17:05 -0500)

teach dry-run convert_to_git not to require a src buffer

When we call convert_to_git in dry-run mode, it may still
want to look at the source buffer, because some CRLF
conversion modes depend on analyzing the source to determine
whether it is in fact convertible CRLF text.

However, the main motivation for convert_to_git's dry-run
mode is that we would decide which method to use to acquire
the blob's data (streaming versus in-core). Requiring this
source analysis creates a chicken-and-egg problem. We are
better off simply guessing that anything we can't analyze
will end up needing conversion.

This patch lets a caller specify a NULL src buffer when
using dry-run mode (and only dry-run mode). A non-zero
return value goes from "we would convert" to "we might
convert"; a zero return value remains "we would definitely
not convert".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

teach convert_to_git a "dry run" modeJeff King Fri, 24 Feb 2012 22:02:37 +0000 (17:02 -0500)

teach convert_to_git a "dry run" mode

Some callers may want to know whether convert_to_git will
actually do anything before performing the conversion
itself (e.g., to decide whether to stream or handle blobs
in-core). This patch lets callers specify the dry run mode
by passing a NULL destination buffer. The return value,
instead of indicating whether conversion happened, will
indicate whether conversion would occur.

For readability, we also include a wrapper function which
makes it more obvious we are not actually performing the
conversion.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5704: match tests to modern styleThomas Rast Thu, 23 Feb 2012 09:42:23 +0000 (10:42 +0100)

t5704: match tests to modern style

The test did not adhere to the current style on several counts:

. empty lines around the test blocks, but within the test string
. ': > file' or even just '> file' with an extra space
. inconsistent indentation
. hand-rolled commits instead of using test_commit

Fix all of them.

There's a catch to the last point: test_commit creates a tag, which the
original test did not create. We still change it to test_commit, and
explicitly delete the tags, so as to highlight that the test relies on not
having them.

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

strbuf: improve strbuf_get*line documentationThomas Rast Thu, 23 Feb 2012 09:42:21 +0000 (10:42 +0100)

strbuf: improve strbuf_get*line documentation

Clarify strbuf_getline() documentation, and add the missing documentation
for strbuf_getwholeline() and strbuf_getwholeline_fd().

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 Thu, 23 Feb 2012 21:38:50 +0000 (13:38 -0800)

Update draft release notes to 1.7.10

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

Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano Thu, 23 Feb 2012 21:30:31 +0000 (13:30 -0800)

Merge branch 'ld/git-p4-expanded-keywords'

* ld/git-p4-expanded-keywords:
: Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
: tracked contents in order to reduce unnecessary merge conflicts.
git-p4: add initial support for RCS keywords

Merge branch 'jk/config-include'Junio C Hamano Thu, 23 Feb 2012 21:30:14 +0000 (13:30 -0800)

Merge branch 'jk/config-include'

* jk/config-include:
: An assignment to the include.path pseudo-variable causes the named file
: to be included in-place when Git looks up configuration variables.
config: add include directive
config: eliminate config_exclusive_filename
config: stop using config_exclusive_filename
config: provide a version of git_config with more options
config: teach git_config_rename_section a file argument
config: teach git_config_set_multivar_in_file a default path
config: copy the return value of prefix_filename
t1300: add missing &&-chaining
docs/api-config: minor clarifications
docs: add a basic description of the config API

Merge branch 'jc/add-refresh-unmerged'Junio C Hamano Thu, 23 Feb 2012 21:30:10 +0000 (13:30 -0800)

Merge branch 'jc/add-refresh-unmerged'

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

Merge branch 'js/configure-libintl'Junio C Hamano Thu, 23 Feb 2012 21:30:04 +0000 (13:30 -0800)

Merge branch 'js/configure-libintl'

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

Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano Thu, 23 Feb 2012 21:30:00 +0000 (13:30 -0800)

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

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

Conflicts:
builtin/remote.c

Merge branch 'tr/perftest'Junio C Hamano Thu, 23 Feb 2012 21:29:56 +0000 (13:29 -0800)

Merge branch 'tr/perftest'

* tr/perftest:
Add a performance test for git-grep
Introduce a performance testing framework
Move the user-facing test library to test-lib-functions.sh

Merge branch 'maint'Junio C Hamano Thu, 23 Feb 2012 21:29:10 +0000 (13:29 -0800)

Merge branch 'maint'

* maint:
README: point to Documentation/SubmittingPatches
Document merge.branchdesc configuration variable

git-p4: add initial support for RCS keywordsLuke Diamand Thu, 23 Feb 2012 07:51:30 +0000 (07:51 +0000)

git-p4: add initial support for RCS keywords

RCS keywords cause problems for git-p4 as perforce always
expands them (if +k is set) and so when applying the patch,
git reports that the files have been modified by both sides,
when in fact they haven't.

This change means that when git-p4 detects a problem applying
a patch, it will check to see if keyword expansion could be
the culprit. If it is, it strips the keywords in the p4
repository so that they match what git is expecting. It then
has another go at applying the patch.

This behaviour is enabled with a new git-p4 configuration
option and is off by default.

Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Faster project searchJakub Narebski Thu, 23 Feb 2012 15:54:48 +0000 (16:54 +0100)

gitweb: Faster project search

Before searching by some field the information we search for must be
filled in, but we do not have to fill other fields that are not
involved in the search.

To be able to request filling only specified fields,
fill_project_list_info() was enhanced in previous commit to take
additional parameters which specify part of projects info to fill.
This way we can limit doing expensive calculations (like running
git-for-each-ref to get 'age' / "Last changed" info) to doing those
only for projects which we will show as search results.

This commit actually uses this interface, changing gitweb code from
the following behavior

fill all project info on all projects
search projects

to behaving like this pseudocode

fill search fields on all projects
search projects
fill all project info on search results

With this commit the number of git commands used to generate search
results is 2*<matched projects> + 1, and depends on number of matched
projects rather than number of all projects (all repositories).

Note: this is 'git for-each-ref' to find last activity, and 'git config'
for each project, and 'git --version' once.

Example performance improvements, for search that selects 2
repositories out of 12 in total:

* Before (warm cache):
"This page took 0.867151 seconds and 27 git commands to generate."

* After (warm cache):
"This page took 0.673643 seconds and 5 git commands to generate."

Now imagine that they are 5 repositories out of 5000, and cold or
trashed cache case.

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

gitweb: Option for filling only specified info in fill_... Jakub Narebski Thu, 23 Feb 2012 15:54:47 +0000 (16:54 +0100)

gitweb: Option for filling only specified info in fill_project_list_info

Enhance fill_project_list_info() subroutine to accept optional
parameters that specify which fields in project information needs to
be filled. If none are specified then fill_project_list_info()
behaves as it used to, and ensure that all project info is filled.

This is in preparation of future lazy filling of project info in
project search and pagination of sorted list of projects.

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

gitweb: Refactor checking if part of project info need... Jakub Narebski Thu, 23 Feb 2012 15:54:46 +0000 (16:54 +0100)

gitweb: Refactor checking if part of project info need filling

Extract the check if given keys (given parts) of project info needs to
be filled into project_info_needs_filling() subroutine. It is for now
a thin wrapper around "!exists $project_info->{$key}".

Note that !defined was replaced by more correct !exists.

While at it uniquify treating of all project info, adding checks for
'age' field before running git_get_last_activity(), and also checking
for all keys filled in code protected by conditional, and not only
one.

The code now looks like this

foreach my $project (@$project_list) {
if (given keys need to be filled) {
fill given keys
}
...
}

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

merge: do not trust fstat(2) too much when checking... Junio C Hamano Thu, 23 Feb 2012 19:24:44 +0000 (11:24 -0800)

merge: do not trust fstat(2) too much when checking interactiveness

The heuristic used by "git merge" to decide if it automatically gives an
editor upon clean automerge is to see if the standard input and the
standard output is the same device and is a tty, we are in an interactive
session. "The same device" test was done by comparing fstat(2) result on
the two file descriptors (and they must match), and we asked isatty() only
for the standard input (we insist that they are the same device and there
is no point asking tty-ness of the standard output).

The stat(2) emulation in the Windows port however does not give a usable
value in the st_ino field, so even if the standard output is connected to
something different from the standard input, "The same device" test may
incorrectly return true. To accomodate it, add another isatty() check for
the standard output stream as well.

Reported-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

README: point to Documentation/SubmittingPatchesMatthieu Moy Thu, 23 Feb 2012 12:52:06 +0000 (13:52 +0100)

README: point to Documentation/SubmittingPatches

It was indeed not obvious for new contributors to find this document in
the source tree, since there were no reference to it outside the
Documentation/ directory.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document merge.branchdesc configuration variableJunio C Hamano Thu, 23 Feb 2012 19:20:15 +0000 (11:20 -0800)

Document merge.branchdesc configuration variable

This was part of the "branch description" feature in the larger
"help people communicate better during their pull based workflow"
topic, but was never documented.

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

disconnect from remote helpers more gentlyJeff King Thu, 23 Feb 2012 10:04:34 +0000 (05:04 -0500)

disconnect from remote helpers more gently

When git spawns a remote helper program (like git-remote-http),
the last thing we do before closing the pipe to the child
process is to send a blank line, telling the helper that we
are done issuing commands. However, the helper may already
have exited, in which case the parent git process will
receive SIGPIPE and die.

In particular, this can happen with the remote-curl helper
when it encounters errors during a push. The helper reports
individual errors for each ref back to git-push, and then
exits with a non-zero exit code. Depending on the exact
timing of the write, the parent process may or may not
receive SIGPIPE.

This causes intermittent test failure in t5541.8, and is a
side effect of 5238cbf (remote-curl: Fix push status report
when all branches fail). Before that commit, remote-curl
would not send the final blank line to indicate that the
list of status lines was complete; it would just exit,
closing the pipe. The parent git-push would notice the
closed pipe while reading the status report and exit
immediately itself, propagating the failing exit code. But
post-5238cbf, remote-curl completes the status list before
exiting, git-push actually runs to completion, and then it
tries to cleanly disconnect the helper, leading to the
SIGPIPE race above.

This patch drops all error-checking when sending the final
"we are about to hang up" blank line to helpers. There is
nothing useful for the parent process to do about errors at
that point anyway, and certainly failing to send our "we are
done with commands" line to a helper that has already exited
is not a problem.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bundle: use a strbuf to scan the log for boundary commitsThomas Rast Wed, 22 Feb 2012 19:34:23 +0000 (20:34 +0100)

bundle: use a strbuf to scan the log for boundary commits

The first part of the bundle header contains the boundary commits, and
could be approximated by

# v2 git bundle
$(git rev-list --pretty=oneline --boundary <ARGS> | grep ^-)

git-bundle actually spawns exactly this rev-list invocation, and does
the grepping internally.

There was a subtle bug in the latter step: it used fgets() with a
1024-byte buffer. If the user has sufficiently long subjects (e.g.,
by not adhering to the git oneline-subject convention in the first
place), the 'oneline' format can easily overflow the buffer. fgets()
then returns the rest of the line in the next call(s). If one of
these remaining parts started with '-', git-bundle would mistakenly
insert it into the bundle thinking it was a boundary commit.

Fix it by using strbuf_getwholeline() instead, which handles arbitrary
line lengths correctly.

Note that on the receiving side in parse_bundle_header() we were
already using strbuf_getwholeline_fd(), so that part is safe.

Reported-by: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bundle: put strbuf_readline_fd in strbuf.c with adjustmentsThomas Rast Wed, 22 Feb 2012 19:34:22 +0000 (20:34 +0100)

bundle: put strbuf_readline_fd in strbuf.c with adjustments

The comment even said that it should eventually go there. While at
it, match the calling convention and name of the function to the
strbuf_get*line family. So it now is strbuf_getwholeline_fd.

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

push: add '--prune' optionFelipe Contreras Wed, 22 Feb 2012 22:43:41 +0000 (00:43 +0200)

push: add '--prune' option

When pushing groups of refs to a remote, there is no simple way to remove
old refs that still exist at the remote that is no longer updated from us.
This will allow us to remove such refs from the remote.

With this change, running this command

$ git push --prune remote refs/heads/*:refs/remotes/laptop/*

removes refs/remotes/laptop/foo from the remote if we do not have branch
"foo" locally anymore.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.7.9.2Junio C Hamano Thu, 23 Feb 2012 01:49:02 +0000 (17:49 -0800)

Sync with 1.7.9.2

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