git
13 years agoMerge branch 'rc/maint-http-wrong-free' into next
Junio C Hamano [Fri, 5 Aug 2011 22:06:50 +0000 (15:06 -0700)] 
Merge branch 'rc/maint-http-wrong-free' into next

* rc/maint-http-wrong-free:
  Makefile: some changes for http-related flag documentation
  http.c: fix an invalid free()

Conflicts:
Makefile

13 years agoMerge branch 'ma/am-exclude' into next
Junio C Hamano [Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)] 
Merge branch 'ma/am-exclude' into next

* ma/am-exclude:
  am: pass exclude down to apply

13 years agoMerge branch 'cb/maint-exec-error-report' into next
Junio C Hamano [Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)] 
Merge branch 'cb/maint-exec-error-report' into next

* cb/maint-exec-error-report:
  notice error exit from pager
  error_routine: use parent's stderr if exec fails

13 years agoMerge branch 'rs/grep-function-context' into next
Junio C Hamano [Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)] 
Merge branch 'rs/grep-function-context' into next

* rs/grep-function-context:
  grep: long context options
  grep: add option to show whole function as context

13 years agoMerge branch 'master' into next
Junio C Hamano [Fri, 5 Aug 2011 21:57:47 +0000 (14:57 -0700)] 
Merge branch 'master' into next

* master:

13 years agoMerge branch 'tc/minix'
Junio C Hamano [Fri, 5 Aug 2011 21:55:00 +0000 (14:55 -0700)] 
Merge branch 'tc/minix'

* tc/minix:
  Makefile: add Minix configuration options.

13 years agoMerge branch 'jc/pack-order-tweak'
Junio C Hamano [Fri, 5 Aug 2011 21:54:57 +0000 (14:54 -0700)] 
Merge branch 'jc/pack-order-tweak'

* jc/pack-order-tweak:
  pack-objects: optimize "recency order"
  core: log offset pack data accesses happened

13 years agoMerge branch 'master' into next
Junio C Hamano [Thu, 4 Aug 2011 23:19:11 +0000 (16:19 -0700)] 
Merge branch 'master' into next

* master:
  docs: put listed example commands in backticks
  gitweb: pass string after encoding in utf-8 to syntax highlighter
  Add option hooks.diffopts to customize change summary in post-receive-email

13 years agodocs: put listed example commands in backticks
Jeff King [Thu, 4 Aug 2011 02:13:29 +0000 (20:13 -0600)] 
docs: put listed example commands in backticks

Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters.  Some manpages make a list of examples, like:

  git foo::
    Run git foo.

  git foo -q::
    Use the "-q" option.

to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).

This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).

As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitweb: pass string after encoding in utf-8 to syntax highlighter
张忠山 [Thu, 4 Aug 2011 15:52:55 +0000 (23:52 +0800)] 
gitweb: pass string after encoding in utf-8 to syntax highlighter

Otherwise the highlight filter would work on a corrupt byte sequence.

Signed-off-by: 张忠山 <zzs213@126.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd option hooks.diffopts to customize change summary in post-receive-email
Jon Jensen [Thu, 4 Aug 2011 03:36:08 +0000 (21:36 -0600)] 
Add option hooks.diffopts to customize change summary in post-receive-email

This makes it easy to customize the git diff-tree options, for example
to include -p to include inline diffs.

It defaults to the current options "--stat --summary --find-copies-harder"
and thus is backward-compatible.

Signed-off-by: Jon Jensen <jon@endpoint.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jk/http-auth-keyring' into next
Junio C Hamano [Wed, 3 Aug 2011 22:25:53 +0000 (15:25 -0700)] 
Merge branch 'jk/http-auth-keyring' into next

* jk/http-auth-keyring:
  credentials: add "getpass" helper
  credentials: add "store" helper
  credentials: add "cache" helper
  docs: end-user documentation for the credential subsystem
  http: use hostname in credential description
  allow the user to configure credential helpers
  look for credentials in config before prompting
  http: use credential API to get passwords
  introduce credentials API
  http: retry authentication failures for all http requests
  remote-curl: don't retry auth failures with dumb protocol
  improve httpd auth tests
  url: decode buffers that are not NUL-terminated

Conflicts:
Documentation/Makefile

13 years agocredentials: add "getpass" helper
Jeff King [Mon, 18 Jul 2011 07:58:59 +0000 (03:58 -0400)] 
credentials: add "getpass" helper

This just does the normal "ask on the terminal, or use
GIT_ASKPASS" logic that we already do. But it's useful for
writers of third-party helpers. See the documentation for an
example.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocredentials: add "store" helper
Jeff King [Mon, 18 Jul 2011 07:58:14 +0000 (03:58 -0400)] 
credentials: add "store" helper

This is like "cache", except that we actually put the
credentials on disk. This can be terribly insecure, of
course, but we do what we can to protect them by filesystem
permissions, and we warn the user in the documentation.

This is not unlike using .netrc to store entries, but it's a
little more user-friendly. Instead of putting credentials in
place ahead of time, we transparently store them after
prompting the user for them once.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocredentials: add "cache" helper
Jeff King [Mon, 18 Jul 2011 07:55:12 +0000 (03:55 -0400)] 
credentials: add "cache" helper

If you access repositories over smart-http using http
authentication, then it can be annoying to have git ask you
for your password repeatedly. We cache credentials in
memory, of course, but git is composed of many small
programs. Having to input your password for each one can be
frustrating.

This patch introduces a credential helper that will cache
passwords in memory for a short period of time.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodocs: end-user documentation for the credential subsystem
Jeff King [Mon, 18 Jul 2011 07:52:47 +0000 (03:52 -0400)] 
docs: end-user documentation for the credential subsystem

The credential API and helper format is already defined in
technical/api-credentials.txt.  This presents the end-user
view.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp: use hostname in credential description
Jeff King [Mon, 18 Jul 2011 07:52:32 +0000 (03:52 -0400)] 
http: use hostname in credential description

Until now, a request for an http password looked like:

  Username:
  Password:

Now it will look like:

  Username for 'example.com':
  Password for 'example.com':

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoallow the user to configure credential helpers
Jeff King [Mon, 18 Jul 2011 07:51:26 +0000 (03:51 -0400)] 
allow the user to configure credential helpers

The functionality for helpers is already there; we just need
to give the users a way to turn it on.

The new functionality is enabled whenever a caller of the
credentials API passes a NULL method list. This will enable
it for all current callers (i.e., the http code).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agolook for credentials in config before prompting
Jeff King [Mon, 18 Jul 2011 07:51:08 +0000 (03:51 -0400)] 
look for credentials in config before prompting

When an http request receives a 401, we ask the user for
both a username and password. While it's generally not a
good idea for us to store the password in plaintext, having
to input the username each time is annoying, and can be
easily solved with a config variable.

This patch teaches the credential subsystem to look up items
in the git config file before prompting. Items are indexed
by the "unique" token passed to the credential system.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp: use credential API to get passwords
Jeff King [Mon, 18 Jul 2011 07:50:53 +0000 (03:50 -0400)] 
http: use credential API to get passwords

This patch converts the http code to use the new credential
API, both for http authentication as well as for getting
certificate passwords.

Most of the code change is simply variable naming (the
passwords are now contained inside a struct). The biggest
change is determining a "unique" context to pass to the
credential API.  This patch uses "http:$host" for http
authentication and "cert:$file" for opening certificate
files.

We pass an empty list of methods to the credential API,
which means that we will use the internal credential_getpass
function. This should yield no behavior change, except that
we now print "Password for 'certificate':" instead of
"Certificate Password:" when asking for certificate
passwords.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agointroduce credentials API
Jeff King [Mon, 18 Jul 2011 07:50:34 +0000 (03:50 -0400)] 
introduce credentials API

There are a few places in git that need to get a username
and password credential from the user; the most notable one
is HTTP authentication for smart-http pushing.

Right now the only choices for providing credentials are to
put them plaintext into your ~/.netrc, or to have git prompt
you (either on the terminal or via an askpass program). The
former is not very secure, and the latter is not very
convenient.

Unfortunately, there is no "always best" solution for
password management. The details will depend on the tradeoff
you want between security and convenience, as well as how
git can integrate with other security systems (e.g., many
operating systems provide a keychain or password wallet for
single sign-on).

This patch abstracts the notion of gathering user
credentials into a few simple functions. These functions can
be backed by our internal git_getpass implementation (which
just prompts the user), or by external helpers which are
free to consult system-specific password wallets, make
custom policy decisions on password caching and storage, or
prompt the user in a non-traditional manner.

The helper protocol aims for simplicity of helper
implementation; see the newly added documentation for
details.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'cb/partial-commit-relative-pathspec' into next
Junio C Hamano [Wed, 3 Aug 2011 22:22:55 +0000 (15:22 -0700)] 
Merge branch 'cb/partial-commit-relative-pathspec' into next

* cb/partial-commit-relative-pathspec:
  commit: allow partial commits with relative paths

13 years agoMerge branch 'ef/ipv4-connect-error-report' into next
Junio C Hamano [Wed, 3 Aug 2011 22:22:55 +0000 (15:22 -0700)] 
Merge branch 'ef/ipv4-connect-error-report' into next

* ef/ipv4-connect-error-report:
  connect: only log if all attempts failed (ipv4)

13 years agoMerge branch 'oa/pull-reflog' into next
Junio C Hamano [Wed, 3 Aug 2011 22:22:55 +0000 (15:22 -0700)] 
Merge branch 'oa/pull-reflog' into next

* oa/pull-reflog:
  pull: remove extra space from reflog message

Conflicts:
git-pull.sh

13 years agoMerge branch 'ms/reflog-show-is-default' into next
Junio C Hamano [Wed, 3 Aug 2011 22:22:54 +0000 (15:22 -0700)] 
Merge branch 'ms/reflog-show-is-default' into next

* ms/reflog-show-is-default:
  reflog: actually default to subcommand 'show'

13 years agoMerge branch 'jl/submodule-status-summary-doc' into next
Junio C Hamano [Wed, 3 Aug 2011 22:22:54 +0000 (15:22 -0700)] 
Merge branch 'jl/submodule-status-summary-doc' into next

* jl/submodule-status-summary-doc:
  Documentation/submodule: add command references and update options

13 years agoMerge branch 'rc/histogram-diff' (early part) into next
Junio C Hamano [Wed, 3 Aug 2011 21:52:31 +0000 (14:52 -0700)] 
Merge branch 'rc/histogram-diff' (early part) into next

* 'rc/histogram-diff' (early part):
  Make test number unique

13 years agoMerge branch 'master' into next
Junio C Hamano [Wed, 3 Aug 2011 21:16:33 +0000 (14:16 -0700)] 
Merge branch 'master' into next

* master:
  add gitignore entry to description about how to write a builtin
  gitattributes: Reword "attribute macro" to "macro attribute"
  gitattributes: Clarify discussion of attribute macros
  Skip archive --remote tests on Windows

13 years agoMerge branch 'maint'
Junio C Hamano [Wed, 3 Aug 2011 21:16:17 +0000 (14:16 -0700)] 
Merge branch 'maint'

* maint:
  add gitignore entry to description about how to write a builtin
  gitattributes: Reword "attribute macro" to "macro attribute"
  gitattributes: Clarify discussion of attribute macros

13 years agoadd gitignore entry to description about how to write a builtin
Heiko Voigt [Wed, 3 Aug 2011 18:06:17 +0000 (20:06 +0200)] 
add gitignore entry to description about how to write a builtin

If the author forgets the gitignore entry the built result will show up
as new file in the git working directory.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMakefile: some changes for http-related flag documentation
Tay Ray Chuan [Wed, 3 Aug 2011 12:07:57 +0000 (20:07 +0800)] 
Makefile: some changes for http-related flag documentation

Rename git-http-pull to git-http-fetch. This was passed over in 215a7ad
(Big tool rename, Wed Sep 7 17:26:23 2005 -0700).

Also, distinguish between dumb and smart in flag docs, as the "warnings"
in NO_CURL and NO_EXPACT are no longer accurate given the introduction
of smart http(s).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp.c: fix an invalid free()
Tay Ray Chuan [Wed, 3 Aug 2011 11:54:03 +0000 (19:54 +0800)] 
http.c: fix an invalid free()

Remove a free() on the static buffer returned by sha1_file_name().

While we're at it, replace xmalloc() calls on the structs
http_(object|pack)_request with xcalloc() so that pointers in the
structs get initialized to NULL. That way, free()'s are safe - for
example, a free() on the url string member when aborting.

This fixes an invalid free().

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Helped-by: Jeff King peff@peff.net
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoam: pass exclude down to apply
maximilian attems [Wed, 3 Aug 2011 09:37:29 +0000 (11:37 +0200)] 
am: pass exclude down to apply

This allows to pass patches around from repositories,
where the other repository doesn't feature certain files.

In the special case this works for dash git sync to klibc dash:
 git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \
        --exclude="usr/dash/ChangeLog" --exclude="usr/dash/dash.1" \
.. -i -s -k ../dash/000X-foo.patch

Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitattributes: Reword "attribute macro" to "macro attribute"
Michael Haggerty [Wed, 3 Aug 2011 13:41:30 +0000 (15:41 +0200)] 
gitattributes: Reword "attribute macro" to "macro attribute"

The new wording makes it clearer that such a beast is an attribute in
addition to being a macro (as opposed to being only a macro that is
used for attributes).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitattributes: Clarify discussion of attribute macros
Michael Haggerty [Wed, 3 Aug 2011 13:41:29 +0000 (15:41 +0200)] 
gitattributes: Clarify discussion of attribute macros

In particular, make it clear that attribute macros are themselves
recorded as attributes in addition to setting other attributes.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoSkip archive --remote tests on Windows
Johannes Sixt [Wed, 3 Aug 2011 08:20:08 +0000 (10:20 +0200)] 
Skip archive --remote tests on Windows

These depend on a working git-upload-archive, which is broken on Windows,
because it depends on fork().

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake test number unique
Johannes Sixt [Wed, 3 Aug 2011 07:25:31 +0000 (09:25 +0200)] 
Make test number unique

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocommit: allow partial commits with relative paths
Clemens Buchacher [Sat, 30 Jul 2011 17:13:47 +0000 (19:13 +0200)] 
commit: allow partial commits with relative paths

In order to do partial commits, git-commit overlays a tree on the
cache and checks pathspecs against the result. Currently, the
overlaying is done using "prefix" which prevents relative pathspecs
with ".." and absolute pathspec from matching when they refer to
files not under "prefix" and absent from the index, but still in
the tree (i.e.  files staged for removal).

The point of providing a prefix at all is performance optimization.
If we say there is no common prefix for the files of interest, then
we have to read the entire tree into the index.

But even if we cannot use the working directory as a prefix, we can
still figure out if there is a common prefix for all given paths,
and use that instead. The pathspec_prefix() routine from ls-files.c
does exactly that.

Any use of global variables is removed from pathspec_prefix() so
that it can be called from commit.c.

Reported-by: Reuben Thomas <rrt@sc3d.org>
Analyzed-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jn/gitweb-config-list-case' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:12 +0000 (16:39 -0700)] 
Merge branch 'jn/gitweb-config-list-case' into next

* jn/gitweb-config-list-case:
  gitweb: Git config keys are case insensitive, make config search too

13 years agoMerge branch 'cb/maint-quiet-push' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:12 +0000 (16:39 -0700)] 
Merge branch 'cb/maint-quiet-push' into next

* cb/maint-quiet-push:
  propagate --quiet to send-pack/receive-pack

Conflicts:
Documentation/git-receive-pack.txt
Documentation/git-send-pack.txt

13 years agoMerge branch 'jl/submodule-update-quiet' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:12 +0000 (16:39 -0700)] 
Merge branch 'jl/submodule-update-quiet' into next

* jl/submodule-update-quiet:
  submodule: update and add must honor --quiet flag

13 years agoMerge branch 'js/ls-tree-error' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:11 +0000 (16:39 -0700)] 
Merge branch 'js/ls-tree-error' into next

* js/ls-tree-error:
  Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
  Add a test to check that git ls-tree sets non-zero exit code on error.

13 years agoMerge branch 'jn/gitweb-system-config' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:11 +0000 (16:39 -0700)] 
Merge branch 'jn/gitweb-system-config' into next

* jn/gitweb-system-config:
  gitweb: Introduce common system-wide settings for convenience

13 years agoMerge branch 'jk/reset-reflog-message-fix' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:11 +0000 (16:39 -0700)] 
Merge branch 'jk/reset-reflog-message-fix' into next

* jk/reset-reflog-message-fix:
  reset: give better reflog messages

13 years agoMerge branch 'jc/diff-index-refactor' into next
Junio C Hamano [Mon, 1 Aug 2011 23:39:11 +0000 (16:39 -0700)] 
Merge branch 'jc/diff-index-refactor' into next

* jc/diff-index-refactor:
  diff-lib: refactor run_diff_index() and do_diff_cache()
  diff-lib: simplify do_diff_cache()

13 years agonotice error exit from pager
Clemens Buchacher [Mon, 1 Aug 2011 17:59:21 +0000 (19:59 +0200)] 
notice error exit from pager

If the pager fails to run, git produces no output, e.g.:

 $ GIT_PAGER=not-a-command git log

The error reporting fails for two reasons:

 (1) start_command: There is a mechanism that detects errors during
     execvp introduced in 2b541bf8 (start_command: detect execvp
     failures early). The child writes one byte to a pipe only if
     execvp fails.  The parent waits for either EOF, when the
     successful execvp automatically closes the pipe (see
     FD_CLOEXEC in fcntl(1)), or it reads a single byte, in which
     case it knows that the execvp failed. This mechanism is
     incompatible with the workaround introduced in 35ce8622
     (pager: Work around window resizing bug in 'less'), which
     waits for input from the parent before the exec. Since both
     the parent and the child are waiting for input from each
     other, that would result in a deadlock. In order to avoid
     that, the mechanism is disabled by closing the child_notifier
     file descriptor.

 (2) finish_command: The parent correctly detects the 127 exit
     status from the child, but the error output goes nowhere,
     since by that time it is already being redirected to the
     child.

No simple solution for (1) comes to mind.

Number (2) can be solved by not sending error output to the pager.
Not redirecting error output to the pager can result in the pager
overwriting error output with standard output, however.

Since there is no reliable way to handle error reporting in the
parent, produce the output in the child instead.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'master' into next
Junio C Hamano [Mon, 1 Aug 2011 23:18:24 +0000 (16:18 -0700)] 
Merge branch 'master' into next

* master:
  connect: correctly number ipv6 network adapter
  git-p4: commit time should be most recent p4 change time
  git-p4: one test missing config git-p4.skipSubmitEditCheck
  git-p4: add missing && in test
  git-p4: use test_when_finished in tests

13 years agogrep: long context options
René Scharfe [Mon, 1 Aug 2011 17:22:52 +0000 (19:22 +0200)] 
grep: long context options

Take long option names for -A (--after-context), -B (--before-context)
and -C (--context) from GNU grep and add a similar long option name
for -W (--function-context).

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogrep: add option to show whole function as context
René Scharfe [Mon, 1 Aug 2011 17:20:53 +0000 (19:20 +0200)] 
grep: add option to show whole function as context

Add a new option, -W, to show the whole surrounding function of a match.

It uses the same regular expressions as -p and diff to find the beginning
of sections.

Currently it will not display comments in front of a function, but those
that are following one.  Despite this shortcoming it is already useful,
e.g. to simply see a more complete applicable context or to extract whole
functions.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopull: remove extra space from reflog message
Ori Avtalion [Fri, 29 Jul 2011 07:19:26 +0000 (10:19 +0300)] 
pull: remove extra space from reflog message

When executing "git pull" with no arguments, the reflog message was:
  "pull : Fast-forward"

Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation/submodule: add command references and update options
Jens Lehmann [Mon, 1 Aug 2011 20:49:21 +0000 (22:49 +0200)] 
Documentation/submodule: add command references and update options

Reference the "git diff" and "git status" commands where they learned
functionality that in earlier git versions was only available through the
'summary' and 'status' subcommands of "git submodule".

The short option '-n' for '--summary-limit' was missing from the synopsis
and the --init option was missing from the "options" section, add those
there. And while at it, quote all options in backticks so they are
decorated properly in the output formats which support that.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'vi/make-test-vector-less-specific'
Junio C Hamano [Mon, 1 Aug 2011 22:00:38 +0000 (15:00 -0700)] 
Merge branch 'vi/make-test-vector-less-specific'

* vi/make-test-vector-less-specific:
  tests: cleanup binary test vector files

13 years agoMerge branch 'jk/clone-detached'
Junio C Hamano [Mon, 1 Aug 2011 22:00:35 +0000 (15:00 -0700)] 
Merge branch 'jk/clone-detached'

* jk/clone-detached:
  clone: always fetch remote HEAD
  make copy_ref globally available
  consider only branches in guess_remote_head
  t: add tests for cloning remotes with detached HEAD

13 years agoMerge branch 'jc/streaming-filter'
Junio C Hamano [Mon, 1 Aug 2011 22:00:29 +0000 (15:00 -0700)] 
Merge branch 'jc/streaming-filter'

* jc/streaming-filter:
  streaming: free git_istream upon closing

13 years agoMerge branch 'sr/transport-helper-fix'
Junio C Hamano [Mon, 1 Aug 2011 22:00:14 +0000 (15:00 -0700)] 
Merge branch 'sr/transport-helper-fix'

* sr/transport-helper-fix: (21 commits)
  transport-helper: die early on encountering deleted refs
  transport-helper: implement marks location as capability
  transport-helper: Use capname for refspec capability too
  transport-helper: change import semantics
  transport-helper: update ref status after push with export
  transport-helper: use the new done feature where possible
  transport-helper: check status code of finish_command
  transport-helper: factor out push_update_refs_status
  fast-export: support done feature
  fast-import: introduce 'done' command
  git-remote-testgit: fix error handling
  git-remote-testgit: only push for non-local repositories
  remote-curl: accept empty line as terminator
  remote-helpers: export GIT_DIR variable to helpers
  git_remote_helpers: push all refs during a non-local export
  transport-helper: don't feed bogus refs to export push
  git-remote-testgit: import non-HEAD refs
  t5800: document some non-functional parts of remote helpers
  t5800: use skip_all instead of prereq
  t5800: factor out some ref tests
  ...

13 years agoMerge branch 'jc/maint-reset-unmerged-path'
Junio C Hamano [Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700)] 
Merge branch 'jc/maint-reset-unmerged-path'

* jc/maint-reset-unmerged-path:
  reset [<commit>] paths...: do not mishandle unmerged paths

13 years agoMerge branch 'maint'
Junio C Hamano [Mon, 1 Aug 2011 21:45:02 +0000 (14:45 -0700)] 
Merge branch 'maint'

* maint:
  connect: correctly number ipv6 network adapter

13 years agoMerge branch 'nk/ref-doc' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:44:24 +0000 (14:44 -0700)] 
Merge branch 'nk/ref-doc' into maint

* nk/ref-doc:
  glossary: clarify description of HEAD
  glossary: update description of head and ref
  glossary: update description of "tag"
  git.txt: de-emphasize the implementation detail of a ref
  check-ref-format doc: de-emphasize the implementation detail of a ref
  git-remote.txt: avoid sounding as if loose refs are the only ones in the world
  git-remote.txt: fix wrong remote refspec

13 years agoMerge branch 'jl/maint-fetch-recursive-fix' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:44:17 +0000 (14:44 -0700)] 
Merge branch 'jl/maint-fetch-recursive-fix' into maint

* jl/maint-fetch-recursive-fix:
  fetch: Also fetch submodules in subdirectories in on-demand mode

13 years agoMerge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:44:13 +0000 (14:44 -0700)] 
Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint

* jc/maint-cygwin-trust-executable-bit-default:
  cygwin: trust executable bit by default

13 years agoMerge branch 'jc/legacy-loose-object' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:43:58 +0000 (14:43 -0700)] 
Merge branch 'jc/legacy-loose-object' into maint

* jc/legacy-loose-object:
  sha1_file.c: "legacy" is really the current format

13 years agoMerge branch 'an/shallow-doc' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:43:53 +0000 (14:43 -0700)] 
Merge branch 'an/shallow-doc' into maint

* an/shallow-doc:
  Document the underlying protocol used by shallow repositories and --depth commands.
  Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.

13 years agoMerge branch 'jc/maint-1.7.3-checkout-describe' into maint
Junio C Hamano [Mon, 1 Aug 2011 21:43:18 +0000 (14:43 -0700)] 
Merge branch 'jc/maint-1.7.3-checkout-describe' into maint

* jc/maint-1.7.3-checkout-describe:
  checkout -b <name>: correctly detect existing branch

13 years agoreflog: actually default to subcommand 'show'
Michael Schubert [Mon, 1 Aug 2011 11:20:42 +0000 (13:20 +0200)] 
reflog: actually default to subcommand 'show'

The reflog manpage says:

git reflog [show] [log-options] [<ref>]

the subcommand 'show' is the default "in the absence of any
subcommands". Currently this is only true if the user provided either
at least one option or no additional argument at all. For example:

git reflog master

won't work. Change this by actually calling cmd_log_reflog in
absence of any subcommand.

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoconnect: only log if all attempts failed (ipv4)
Erik Faye-Lund [Mon, 1 Aug 2011 11:16:10 +0000 (13:16 +0200)] 
connect: only log if all attempts failed (ipv4)

In 63a995b (Do not log unless all connect() attempts fail), a
mechanism to only log connection errors if all attempts failed
was introduced for the IPv6 code-path, but not for the IPv4 one.

Introduce a matching mechanism so IPv4-users also benefit from
this noise-reduction.

Move the call to socket after filling in sa, to make it more
apparent that errno can't change in between.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint' into ef/ipv4-connect-error-report
Junio C Hamano [Mon, 1 Aug 2011 17:49:40 +0000 (10:49 -0700)] 
Merge branch 'maint' into ef/ipv4-connect-error-report

* maint:
  connect: correctly number ipv6 network adapter

13 years agoconnect: correctly number ipv6 network adapter
Erik Faye-Lund [Mon, 1 Aug 2011 11:16:09 +0000 (13:16 +0200)] 
connect: correctly number ipv6 network adapter

In ba50532, the variable 'cnt' was added to both the IPv6 and the
IPv4 version of git_tcp_connect_sock, intended to identify which
network adapter the connection failed on. But in the IPv6 version,
the variable was never increased, leaving it constantly at zero.

This behaviour isn't very useful, so let's fix it by increasing
the variable at every loop-iteration.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-p4: commit time should be most recent p4 change time
Pete Wyckoff [Sun, 31 Jul 2011 13:45:55 +0000 (09:45 -0400)] 
git-p4: commit time should be most recent p4 change time

When importing a repo, the time on the initial commit had been
just "now".  But this causes problems when trying to share among
git-p4 repos that were created identically, although at different
times.  Instead, use the time in the top-most p4 change as the
time for the git import commit.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-p4: one test missing config git-p4.skipSubmitEditCheck
Pete Wyckoff [Sun, 31 Jul 2011 13:45:38 +0000 (09:45 -0400)] 
git-p4: one test missing config git-p4.skipSubmitEditCheck

Add this missing line in one of the tests.  Otherwise, on fast
machines, the following git-p4 commit will complain that nobody
edited the submission message.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-p4: add missing && in test
Pete Wyckoff [Sun, 31 Jul 2011 13:45:17 +0000 (09:45 -0400)] 
git-p4: add missing && in test

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-p4: use test_when_finished in tests
Pete Wyckoff [Sun, 31 Jul 2011 13:44:50 +0000 (09:44 -0400)] 
git-p4: use test_when_finished in tests

Cleanup nicely when tests fail.  This avoids many duplicated
lines in the tests, and adds cleanup in a couple of tests that
did not have it.  When one fails, now all the rest will not
fail too.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'master' into next
Junio C Hamano [Mon, 1 Aug 2011 01:59:09 +0000 (18:59 -0700)] 
Merge branch 'master' into next

* master:
  Break down no-lstat() condition checks in verify_uptodate()
  t7400: fix bogus test failure with symlinked trash
  Documentation: clarify the invalidated tree entry format

13 years agoMerge branch 'maint'
Junio C Hamano [Mon, 1 Aug 2011 01:57:32 +0000 (18:57 -0700)] 
Merge branch 'maint'

* maint:
  Break down no-lstat() condition checks in verify_uptodate()
  t7400: fix bogus test failure with symlinked trash
  Documentation: clarify the invalidated tree entry format

13 years agopropagate --quiet to send-pack/receive-pack
Clemens Buchacher [Sat, 30 Jul 2011 12:10:14 +0000 (14:10 +0200)] 
propagate --quiet to send-pack/receive-pack

Currently, git push --quiet produces some non-error output, e.g.:

 $ git push --quiet
 Unpacking objects: 100% (3/3), done.

Add the --quiet option to send-pack/receive-pack and pass it to
unpack-objects in the receive-pack codepath and to receive-pack in
the push codepath.

This fixes a bug reported for the fedora git package:

 https://bugzilla.redhat.com/show_bug.cgi?id=725593

Reported-by: Jesse Keating <jkeating@redhat.com>
Cc: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoBreak down no-lstat() condition checks in verify_uptodate()
Nguyễn Thái Ngọc Duy [Sat, 30 Jul 2011 03:55:05 +0000 (10:55 +0700)] 
Break down no-lstat() condition checks in verify_uptodate()

Make it easier to grok under what conditions we can skip lstat().

While at there, shorten ie_match_stat() line for the sake of my eyes.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot7400: fix bogus test failure with symlinked trash
Jeff King [Sat, 30 Jul 2011 15:05:54 +0000 (09:05 -0600)] 
t7400: fix bogus test failure with symlinked trash

One of the tests in t7400 fails if the trash directory has a
symlink anywhere in its path. E.g.:

  $ mkdir /tmp/git-test
  $ mkdir /tmp/git-test/real
  $ ln -s real /tmp/git-test/link

  $ ./t7400-submodule-basic --root=/tmp/git-test/real
  ...
  # passed all 44 test(s)

  $ ./t7400-submodule-basic --root=/tmp/git-test/link
  ...
  not ok - 41 use superproject as upstream when path is relative and no url is set there

The failing test does:

  git submodule add ../repo relative &&
  ...
  git submodule sync relative &&
  test "$(git config submodule.relative.url)" = "$submodurl/repo"

where $submodurl comes from the $TRASH_DIRECTORY the user
gave us. However, git will resolve symlinks when converting
the relative path into an absolute one, leading them to be
textually different (even though they point to the same
directory).

Fix this by asking pwd to canonicalize the name of the trash
directory for us.

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitweb: Git config keys are case insensitive, make config search too
Jakub Narebski [Thu, 28 Jul 2011 21:38:03 +0000 (23:38 +0200)] 
gitweb: Git config keys are case insensitive, make config search too

"git config -z -l" that gitweb uses in git_parse_project_config() to
populate %config hash returns section and key names of config
variables in lowercase (they are case insensitive).  When checking
%config in git_get_project_config() we have to take it into account.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoerror_routine: use parent's stderr if exec fails
Clemens Buchacher [Wed, 27 Jul 2011 21:32:34 +0000 (23:32 +0200)] 
error_routine: use parent's stderr if exec fails

The new process's error output may be redirected elsewhere, but if
the exec fails, output should still go to the parent's stderr. This
has already been done for the die_routine. Do the same for
error_routine.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: clarify the invalidated tree entry format
Carlos Martín Nieto [Tue, 26 Jul 2011 12:27:57 +0000 (14:27 +0200)] 
Documentation: clarify the invalidated tree entry format

When the entry_count is -1, the tree is invalidated and therefore has
not associated hash (or object name). Explicitly state that the next
entry starts after the newline.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agosubmodule: update and add must honor --quiet flag
Jens Lehmann [Tue, 26 Jul 2011 21:39:03 +0000 (23:39 +0200)] 
submodule: update and add must honor --quiet flag

When using the --quiet flag "git submodule update" and "git submodule add"
didn't behave as the documentation stated. They printed progress output
from the clone, even though they should only print error messages.

Fix that by passing the -q flag to git clone in module_clone() when the
GIT_QUIET variable is set. Two tests in t7400 have been modified to test
that behavior.

Reported-by: Daniel Holtmann-Rice <flyingtabmow@gmail.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jk/clone-detached' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:41 +0000 (11:59 -0700)] 
Merge branch 'jk/clone-detached' into next

* jk/clone-detached:
  clone: always fetch remote HEAD
  make copy_ref globally available
  consider only branches in guess_remote_head
  t: add tests for cloning remotes with detached HEAD

13 years agoMerge branch 'js/ref-namespaces' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:41 +0000 (11:59 -0700)] 
Merge branch 'js/ref-namespaces' into next

* js/ref-namespaces:
  ref namespaces: tests
  ref namespaces: documentation
  ref namespaces: Support remote repositories via upload-pack and receive-pack
  ref namespaces: infrastructure
  Fix prefix handling in ref iteration functions

13 years agoMerge branch 'rc/histogram-diff' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:41 +0000 (11:59 -0700)] 
Merge branch 'rc/histogram-diff' into next

* rc/histogram-diff:
  xdiff/xprepare: use a smaller sample size for histogram diff
  xdiff/xprepare: skip classification
  teach --histogram to diff
  t4033-diff-patience: factor out tests
  xdiff/xpatience: factor out fall-back-diff function
  xdiff/xprepare: refactor abort cleanups
  xdiff/xprepare: use memset()

13 years agoMerge branch 'jc/pack-order-tweak' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:41 +0000 (11:59 -0700)] 
Merge branch 'jc/pack-order-tweak' into next

* jc/pack-order-tweak:
  pack-objects: optimize "recency order"
  core: log offset pack data accesses happened

13 years agoMerge branch 'tc/minix' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:40 +0000 (11:59 -0700)] 
Merge branch 'tc/minix' into next

* tc/minix:
  Makefile: add Minix configuration options.

13 years agoMerge branch 'vi/make-test-vector-less-specific' into next
Junio C Hamano [Mon, 25 Jul 2011 18:59:40 +0000 (11:59 -0700)] 
Merge branch 'vi/make-test-vector-less-specific' into next

* vi/make-test-vector-less-specific:
  tests: cleanup binary test vector files

13 years agoEnsure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
Jon Seymour [Sun, 24 Jul 2011 14:59:14 +0000 (00:59 +1000)] 
Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

In the case of a corrupt repository, git ls-tree may report an error but
presently it exits with a code of 0.

This change uses the return code of read_tree_recursive instead.

Improved-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'master' into next
Junio C Hamano [Sun, 24 Jul 2011 23:23:07 +0000 (16:23 -0700)] 
Merge branch 'master' into next

* master:
  tests: print failed test numbers at the end of the test run

13 years agoMerge branch 'maint'
Junio C Hamano [Sun, 24 Jul 2011 23:23:01 +0000 (16:23 -0700)] 
Merge branch 'maint'

* maint:
  tests: print failed test numbers at the end of the test run

13 years agogitweb: Introduce common system-wide settings for convenience
Jakub Narebski [Sun, 24 Jul 2011 22:29:18 +0000 (00:29 +0200)] 
gitweb: Introduce common system-wide settings for convenience

Because of backward compatibility we cannot change gitweb to always
use /etc/gitweb.conf (i.e. even if gitweb_config.perl exists).  For
common system-wide settings we therefore need separate configuration
file: /etc/gitweb-common.conf.

Long description:

gitweb currently obtains configuration from the following sources:

  1. per-instance configuration file (default: gitweb_conf.perl)
  2. system-wide configuration file (default: /etc/gitweb.conf)

If per-instance configuration file exists, then system-wide
configuration is _not used at all_.  This is quite untypical and
suprising behavior.

Moreover it is different from way git itself treats /etc/git.conf.  It
reads in stuff from /etc/git.conf and then local repos can change or
override things as needed.  In fact this is quite beneficial, because
it gives site admins a simple and easy way to give an automatic hint
to a repo about things the admin would like.

On the other hand changing current behavior may lead to the situation,
where something in /etc/gitweb.conf may interfere with unintended
interaction in the local repository.  One solution would be to
_require_ to do explicit include; with read_config_file() it is now
easy, as described in gitweb/README (description introduced in this
commit).

But as J.H. noticed we cannot ask people to modify their per-instance
gitweb config file to include system-wide settings, nor we can require
them to do this.

Therefore, as proposed by Junio, for gitweb to have centralized config
elements while retaining backwards compatibility, introduce separate
common system-wide configuration file, by default /etc/gitweb-common.conf

Noticed-by: Drew Northup <drew.northup@maine.edu>
Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Inspired-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agotests: print failed test numbers at the end of the test run
Jens Lehmann [Sun, 24 Jul 2011 13:35:54 +0000 (15:35 +0200)] 
tests: print failed test numbers at the end of the test run

On modern multi-core processors "make test" is often run in multiple jobs.
If one of them fails the test run does stop, but the concurrently running
tests finish their run. It is rather easy to find out which test failed by
doing a "ls -d t/trash*". But that only works when you don't use the "-i"
option to "make test" because you want to get an overview of all failing
tests. In that case all thrash directories are deleted end and the
information which tests failed is lost.

If one or more tests failed, print a list of them before the test summary:

failed test(s): t1000 t6500

fixed   0
success 7638
failed  3
broken  49
total   7723

This makes it possible to just run the test suite with -i and collect all
failed test scripts at the end for further examination.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd a test to check that git ls-tree sets non-zero exit code on error.
Jon Seymour [Sun, 24 Jul 2011 14:59:13 +0000 (00:59 +1000)] 
Add a test to check that git ls-tree sets non-zero exit code on error.

Expected to fail at this commit, fixed by subsequent commit.

Additional tests of adhoc or uncategorised nature should be added to this
file.

Improved-by: Jens Lehmann <Jens.Lehmann@web.de>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jc/streaming-filter' into next
Junio C Hamano [Fri, 22 Jul 2011 22:33:37 +0000 (15:33 -0700)] 
Merge branch 'jc/streaming-filter' into next

* jc/streaming-filter:
  streaming: free git_istream upon closing

13 years agoMerge branch 'master' into next
Junio C Hamano [Fri, 22 Jul 2011 22:32:11 +0000 (15:32 -0700)] 
Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.7
  doc/fast-import: clarify notemodify command
  Documentation: minor grammatical fix in rev-list-options.txt
  Documentation: git-filter-branch honors replacement refs
  remote-curl: Add a format check to parsing of info/refs
  git-config: Remove extra whitespaces

13 years agoUpdate draft release notes to 1.7.7
Junio C Hamano [Fri, 22 Jul 2011 22:32:03 +0000 (15:32 -0700)] 
Update draft release notes to 1.7.7

The third batch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'dc/stash-con-untracked'
Junio C Hamano [Fri, 22 Jul 2011 21:46:28 +0000 (14:46 -0700)] 
Merge branch 'dc/stash-con-untracked'

* dc/stash-con-untracked:
  stash: Add --include-untracked option to stash and remove all untracked files

Conflicts:
git-stash.sh

13 years agoMerge branch 'jk/tag-contains-ab'
Junio C Hamano [Fri, 22 Jul 2011 21:45:19 +0000 (14:45 -0700)] 
Merge branch 'jk/tag-contains-ab'

* jk/tag-contains-ab:
  Revert clock-skew based attempt to optimize tag --contains traversal
  git skew: a tool to find how big a clock skew exists in the history
  default core.clockskew variable to one day
  limit "contains" traversals based on commit timestamp
  tag: speed up --contains calculation

13 years agoMerge branch 'dz/connect-error-report'
Junio C Hamano [Fri, 22 Jul 2011 21:44:28 +0000 (14:44 -0700)] 
Merge branch 'dz/connect-error-report'

* dz/connect-error-report:
  Do not log unless all connect() attempts fail

13 years agoMerge branch 'mz/doc-rebase-abort'
Junio C Hamano [Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)] 
Merge branch 'mz/doc-rebase-abort'

* mz/doc-rebase-abort:
  rebase: clarify "restore the original branch"

13 years agoMerge branch 'bw/log-all-ref-updates-doc'
Junio C Hamano [Fri, 22 Jul 2011 21:43:51 +0000 (14:43 -0700)] 
Merge branch 'bw/log-all-ref-updates-doc'

* bw/log-all-ref-updates-doc:
  Documentation: clearly specify what refs are honored by core.logAllRefUpdates