git/git.git
8 years agogit-merge-one-file: style cleanup
Kevin Bracey [Sun, 24 Mar 2013 12:26:23 +0000 (14:26 +0200)]
git-merge-one-file: style cleanup

Update style to match Documentation/CodingGuidelines.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agomerge-one-file: remove stale comment
Junio C Hamano [Mon, 25 Mar 2013 17:48:24 +0000 (10:48 -0700)]
merge-one-file: remove stale comment

The "funny filename" comment was from b539c5e8fbd3 (git-merge-one:
new merge world order., 2005-12-07) where the removed code just
before that new comment ended with:

        merge "$4" "$orig" "$src2"

(yes, we used to use "merge" program from the RCS suite).  The
comment refers to one of the bad side effect the old code used to
have and warns against such a practice, i.e. it was talking about
the code that no longer existed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agomergetools/p4merge: create a base if none available
Kevin Bracey [Wed, 13 Mar 2013 01:12:21 +0000 (03:12 +0200)]
mergetools/p4merge: create a base if none available

Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:

   p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"

Commit 0a0ec7bd changed this to:

   p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"

to avoid the problem of being unable to save in some circumstances with
similar inputs.

Unfortunately this approach produces much worse results on differing
inputs. P4Merge really regards the blank file as the base, and once you
have just a couple of differences between the two branches you end up
with one a massive full-file conflict. The 3-way diff is not readable,
and you have to invoke "difftool MERGE_HEAD HEAD" manually to get a
useful view.

The original approach appears to have invoked special 2-way merge
behaviour in P4Merge that occurs only if the base filename is "" or
equal to the left input.  You get a good visual comparison, and it does
not auto-resolve differences. (Normally if one branch matched the base,
it would autoresolve to the other branch).

But there appears to be no way of getting this 2-way behaviour and being
able to reliably save. Having base==left appears to be triggering other
assumptions. There are tricks the user can use to force the save icon
on, but it's not intuitive.

So we now follow a suggestion given in the original patch's discussion:
generate a virtual base, consisting of the lines common to the two
branches. This is the same as the technique used in resolve and octopus
merges, so we relocate that code to a shared function.

Note that if there are no differences at the same location, this
technique can lead to automatic resolution without conflict, combining
everything from the 2 files.  As with the other merges using this
technique, we assume the user will inspect the result before saving.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agomergetools/p4merge: swap LOCAL and REMOTE
Kevin Bracey [Wed, 13 Mar 2013 01:12:20 +0000 (03:12 +0200)]
mergetools/p4merge: swap LOCAL and REMOTE

Reverse LOCAL and REMOTE when invoking P4Merge as a mergetool, so that
the incoming branch is now in the left-hand, blue triangle pane, and the
current branch is in the right-hand, green circle pane.

This change makes use of P4Merge consistent with its built-in help, its
reference documentation, and Perforce itself. But most importantly, it
makes merge results clearer. P4Merge is not totally symmetrical between
left and right; despite changing a few text labels from "theirs/ours" to
"left/right" when invoked manually, it still retains its original
Perforce "theirs/ours" viewpoint.

Most obviously, in the result pane P4Merge shows changes that are common
to both branches in green. This is on the basis of the current branch
being green, as it is when invoked from Perforce; it means that lines in
the result are blue if and only if they are being changed by the merge,
making the resulting diff clearer.

Note that P4Merge now shows "ours" on the right for both diff and merge,
unlike other diff/mergetools, which always have REMOTE on the right.
But observe that REMOTE is the working tree (ie "ours") for a diff,
while it's another branch (ie "theirs") for a merge.

Ours and theirs are reversed for a rebase - see "git help rebase".
However, this does produce the desired "show the results of this commit"
effect in P4Merge - changes that remain in the rebased commit (in your
branch, but not in the new base) appear in blue; changes that do not
appear in the rebased commit (from the new base, or common to both) are
in green. If Perforce had rebase, they'd probably not swap ours/theirs,
but make P4Merge show common changes in blue, picking out our changes in
green. We can't do that, so this is next best.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Sat, 9 Mar 2013 19:54:05 +0000 (11:54 -0800)]
Merge branch 'maint'

* maint:
  perf: update documentation of GIT_PERF_REPEAT_COUNT

8 years agoperf: update documentation of GIT_PERF_REPEAT_COUNT
Antoine Pelisse [Sat, 9 Mar 2013 15:29:25 +0000 (16:29 +0100)]
perf: update documentation of GIT_PERF_REPEAT_COUNT

Currently the documentation of GIT_PERF_REPEAT_COUNT says the default is
five while "perf-lib.sh" uses a value of three as a default.

Update the documentation so that it is consistent with the code.

Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge git://git.bogomips.org/git-svn
Junio C Hamano [Fri, 8 Mar 2013 22:15:55 +0000 (14:15 -0800)]
Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git svn: consistent spacing after "W:" in warnings
  git svn: ignore partial svn:mergeinfo

8 years agoUpdate draft release notes to 1.8.2
Junio C Hamano [Fri, 8 Mar 2013 22:14:27 +0000 (14:14 -0800)]
Update draft release notes to 1.8.2

Split the backward-compatibility notes into two sections, the ones
that affect this release, and the other to describe changes meant
for Git 2.0.  The latter gives a context to understand why the
changes for this release is necessary.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit svn: consistent spacing after "W:" in warnings
Eric Wong [Fri, 8 Mar 2013 09:46:41 +0000 (09:46 +0000)]
git svn: consistent spacing after "W:" in warnings

All other instances of "W:"-prefixed warning messages have a space after
the "W:" to help with readability.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
8 years agogit svn: ignore partial svn:mergeinfo
Jan Pešta [Thu, 7 Mar 2013 11:28:14 +0000 (12:28 +0100)]
git svn: ignore partial svn:mergeinfo

Currently this is cosmetic change - the merges are ignored, becuase the methods
(lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing text with number.

See http://www.open.collab.net/community/subversion/articles/merge-info.html
Extract:
The range r30430:30435 that was added to 1.5.x in this merge has a '*' suffix for 1.5.x\www.
This '*' is the marker for a non-inheritable mergeinfo range.
The '*' means that only the path on which the mergeinfo is explicitly set has had this range merged into it.

Signed-off-by: Jan Pesta <jan.pesta@certicon.cz>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
8 years agoGit 1.8.2-rc3 v1.8.2-rc3
Junio C Hamano [Thu, 7 Mar 2013 21:14:39 +0000 (13:14 -0800)]
Git 1.8.2-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Thu, 7 Mar 2013 21:12:34 +0000 (13:12 -0800)]
Merge git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
  l10n: zh_CN.po: translate 1 new message
  l10n: de.po: translate 1 new message
  l10n: vi.po: Update translation (2009t0f0u)
  l10n: Update Swedish translation (2009t0f0u)
  l10n: git.pot: v1.8.2 round 4 (1 changed)

8 years agoMerge branch 'mp/complete-paths'
Junio C Hamano [Thu, 7 Mar 2013 21:11:55 +0000 (13:11 -0800)]
Merge branch 'mp/complete-paths'

* mp/complete-paths:
  git-completion.zsh: define __gitcomp_file compatibility function

8 years agoMerge branch 'maint'
Junio C Hamano [Thu, 7 Mar 2013 20:50:36 +0000 (12:50 -0800)]
Merge branch 'maint'

* maint:
  gitweb/README: remove reference to git.kernel.org

8 years agoMerge branch 'mh/maint-ceil-absolute' into maint
Junio C Hamano [Thu, 7 Mar 2013 20:49:57 +0000 (12:49 -0800)]
Merge branch 'mh/maint-ceil-absolute' into maint

* mh/maint-ceil-absolute:
  Provide a mechanism to turn off symlink resolution in ceiling paths

8 years agogitweb/README: remove reference to git.kernel.org
Fredrik Gustafsson [Thu, 7 Mar 2013 01:23:43 +0000 (02:23 +0100)]
gitweb/README: remove reference to git.kernel.org

git.kernel.org no longer uses gitweb but has switched to cgit.

Info about this can be found on: https://www.kernel.org/pelican.html
or simply by looking at http://git.kernel.org . This is change since
2013-03-01.

Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agol10n: zh_CN.po: translate 1 new message
Jiang Xin [Tue, 5 Mar 2013 05:09:55 +0000 (13:09 +0800)]
l10n: zh_CN.po: translate 1 new message

Translate 1 new message came from git.pot update in ed1ddaf
(l10n: git.pot: v1.8.2 round 4 (1 changed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
8 years agol10n: de.po: translate 1 new message
Ralf Thielow [Tue, 5 Mar 2013 05:32:41 +0000 (06:32 +0100)]
l10n: de.po: translate 1 new message

Translate 1 new message came from git.pot update in
ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
8 years agol10n: vi.po: Update translation (2009t0f0u)
Tran Ngoc Quan [Wed, 6 Mar 2013 06:57:17 +0000 (13:57 +0700)]
l10n: vi.po: Update translation (2009t0f0u)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
8 years agogit-completion.zsh: define __gitcomp_file compatibility function
Matthieu Moy [Tue, 5 Mar 2013 08:43:55 +0000 (09:43 +0100)]
git-completion.zsh: define __gitcomp_file compatibility function

Commit fea16b47b60 (Fri Jan 11 19:48:43 2013, Manlio Perillo,
git-completion.bash: add support for path completion), introduced a new
__gitcomp_file function that uses the bash builtin "compgen". The
function was redefined for ZSH in the deprecated section of
git-completion.bash, but not in the new git-completion.zsh script.

As a result, users of git-completion.zsh trying to complete "git add
fo<tab>" get an error:

git add fo__gitcomp_file:8: command not found: compgen

This patch adds the redefinition and removes the error.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agol10n: Update Swedish translation (2009t0f0u)
Peter Krefting [Tue, 5 Mar 2013 08:18:25 +0000 (09:18 +0100)]
l10n: Update Swedish translation (2009t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
8 years agol10n: git.pot: v1.8.2 round 4 (1 changed)
Jiang Xin [Tue, 5 Mar 2013 04:41:45 +0000 (12:41 +0800)]
l10n: git.pot: v1.8.2 round 4 (1 changed)

Generate po/git.pot from v1.8.2-rc2-4-g77995 for git v1.8.2
l10n round 4.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
8 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Mon, 4 Mar 2013 09:16:02 +0000 (01:16 -0800)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: de.po: correct translation of "bisect" messages
  l10n: de.po: translate 5 new messages
  l10n: de.po: translate 35 new messages

8 years agoGit 1.8.2-rc2 v1.8.2-rc2
Junio C Hamano [Sun, 3 Mar 2013 09:24:11 +0000 (01:24 -0800)]
Git 1.8.2-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoSync with 1.8.1.5
Junio C Hamano [Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)]
Sync with 1.8.1.5

8 years agoGit 1.8.1.5 v1.8.1.5
Junio C Hamano [Fri, 1 Mar 2013 21:15:29 +0000 (13:15 -0800)]
Git 1.8.1.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMake !pattern in .gitattributes non-fatal
Thomas Rast [Fri, 1 Mar 2013 20:06:17 +0000 (21:06 +0100)]
Make !pattern in .gitattributes non-fatal

Before 82dce99 (attr: more matching optimizations from .gitignore,
2012-10-15), .gitattributes did not have any special treatment of a
leading '!'.  The docs, however, always said

  The rules how the pattern matches paths are the same as in
  `.gitignore` files; see linkgit:gitignore[5].

By those rules, leading '!' means pattern negation.  So 82dce99
correctly determined that this kind of line makes no sense and should
be disallowed.

However, users who actually had a rule for files starting with a '!'
are in a bad position: before 82dce99 '!' matched that literal
character, so it is conceivable that users have .gitattributes with
such lines in them.  After 82dce99 the unescaped version was
disallowed in such a way that git outright refuses to run(!) most
commands in the presence of such a .gitattributes.  It therefore
becomes very hard to fix, let alone work with, such repositories.

Let's at least allow the users to fix their repos: change the fatal
error into a warning.

Reported-by: mathstuf@gmail.com
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'wk/user-manual' into maint
Junio C Hamano [Fri, 1 Mar 2013 18:37:40 +0000 (10:37 -0800)]
Merge branch 'wk/user-manual' into maint

* wk/user-manual:
  user-manual: Flesh out uncommitted changes and submodule updates
  user-manual: Use request-pull to generate "please pull" text
  user-manual: Reorganize the reroll sections, adding 'git rebase -i'

8 years agoDocumentation/githooks: Fix linkgit
Andrew Wong [Fri, 1 Mar 2013 17:23:57 +0000 (12:23 -0500)]
Documentation/githooks: Fix linkgit

Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Wed, 27 Feb 2013 18:10:28 +0000 (10:10 -0800)]
Merge branch 'maint'

* maint:
  Update draft release notes to 1.8.1.5
  Documentation/submodule: Add --force to update synopsis

8 years agoUpdate draft release notes to 1.8.1.5
Junio C Hamano [Wed, 27 Feb 2013 18:09:59 +0000 (10:09 -0800)]
Update draft release notes to 1.8.1.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'ef/non-ascii-parse-options-error-diag' into maint
Junio C Hamano [Wed, 27 Feb 2013 18:04:26 +0000 (10:04 -0800)]
Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

* ef/non-ascii-parse-options-error-diag:
  parse-options: report uncorrupted multi-byte options

8 years agoMerge branch 'wk/man-deny-current-branch-is-default-these-days' into maint
Junio C Hamano [Wed, 27 Feb 2013 18:01:21 +0000 (10:01 -0800)]
Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint

* wk/man-deny-current-branch-is-default-these-days:
  user-manual: typofix (ofthe->of the)
  user-manual: Update for receive.denyCurrentBranch=refuse

8 years agoMerge branch 'jn/less-reconfigure' into maint
Junio C Hamano [Wed, 27 Feb 2013 17:59:19 +0000 (09:59 -0800)]
Merge branch 'jn/less-reconfigure' into maint

* jn/less-reconfigure:
  Makefile: avoid infinite loop on configure.ac change

8 years agoMerge branch 'mh/maint-ceil-absolute'
Junio C Hamano [Wed, 27 Feb 2013 17:47:27 +0000 (09:47 -0800)]
Merge branch 'mh/maint-ceil-absolute'

An earlier workaround designed to help people who list logical
directories that will not match what getcwd(3) returns in the
GIT_CEILING_DIRECTORIES had an adverse effect when it is slow to
stat and readlink a directory component of an element listed on it.

* mh/maint-ceil-absolute:
  Provide a mechanism to turn off symlink resolution in ceiling paths

8 years agoDocumentation/submodule: Add --force to update synopsis
Brad King [Wed, 27 Feb 2013 00:41:34 +0000 (19:41 -0500)]
Documentation/submodule: Add --force to update synopsis

In commit 9db31bdf (submodule: Add --force option for git submodule
update, 2011-04-01) we added the option to the implementation's usage
synopsis but forgot to add it to the synopsis in the command
documentation.  Add the option to the synopsis in the same location it
is reported in usage and re-wrap the options to avoid long lines.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'for-junio' of git://github.com/kusma/git
Junio C Hamano [Tue, 26 Feb 2013 17:17:08 +0000 (09:17 -0800)]
Merge branch 'for-junio' of git://github.com/kusma/git

* 'for-junio' of git://github.com/kusma/git:
  wincred: improve compatibility with windows versions
  wincred: accept CRLF on stdin to simplify console usage

8 years agoRevert "compat: add strtok_r()"
Erik Faye-Lund [Tue, 26 Feb 2013 16:58:38 +0000 (17:58 +0100)]
Revert "compat: add strtok_r()"

This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc.

commit 28c5d9e ("vcs-svn: drop string_pool") previously removed
the only call-site for strtok_r. So let's get rid of the compat
implementation as well.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agowincred: improve compatibility with windows versions
Karsten Blees [Thu, 10 Jan 2013 10:52:12 +0000 (11:52 +0100)]
wincred: improve compatibility with windows versions

On WinXP, the windows credential helper doesn't work at all (due to missing
Cred[Un]PackAuthenticationBuffer APIs). On Win7, the credential format used
by wincred is incompatible with native Windows tools (such as the control
panel applet or 'cmdkey.exe /generic'). These Windows tools only set the
TargetName, UserName and CredentialBlob members of the CREDENTIAL
structure (where CredentialBlob is the UTF-16-encoded password).

Remove the unnecessary packing / unpacking of the password, along with the
related API definitions, for compatibility with Windows XP.

Don't use CREDENTIAL_ATTRIBUTEs to identify credentials for compatibility
with Windows credential manager tools. Parse the protocol, username, host
and path fields from the credential's target name instead.

Credentials created with an old wincred version will have mangled or empty
passwords after this change.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
8 years agowincred: accept CRLF on stdin to simplify console usage
Karsten Blees [Wed, 9 Jan 2013 11:49:26 +0000 (12:49 +0100)]
wincred: accept CRLF on stdin to simplify console usage

The windows credential helper currently only accepts LF on stdin, but bash
and cmd.exe both send CRLF. This prevents interactive use in the console.

Change the stdin parser to optionally accept CRLF.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
8 years agol10n: de.po: correct translation of "bisect" messages
Ralf Thielow [Sat, 23 Feb 2013 16:47:32 +0000 (17:47 +0100)]
l10n: de.po: correct translation of "bisect" messages

The term "bisect" was translated as "halbieren", we should
translate it as "binäre Suche" (binary search). While at
there, we should leave "bisect run" untranslated since it's
a subcommand of "git bisect".

Suggested-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
8 years agol10n: de.po: translate 5 new messages
Ralf Thielow [Tue, 19 Feb 2013 16:59:28 +0000 (17:59 +0100)]
l10n: de.po: translate 5 new messages

Translate 5 new messages came from git.pot update in 235537a
(l10n: git.pot: v1.8.2 round 3 (5 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
8 years agol10n: de.po: translate 35 new messages
Ralf Thielow [Thu, 14 Feb 2013 17:27:00 +0000 (18:27 +0100)]
l10n: de.po: translate 35 new messages

Translate 35 new messages came from git.pot update
in 9caaf23 (l10n: Update git.pot (35 new, 14 removed
messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
8 years agoGit 1.8.2-rc1 v1.8.2-rc1
Junio C Hamano [Mon, 25 Feb 2013 16:39:23 +0000 (08:39 -0800)]
Git 1.8.2-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Mon, 25 Feb 2013 17:02:58 +0000 (09:02 -0800)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: vi.po: Updated 5 new messages (2009t0f0u)
  l10n: Update Swedish translation (2009t0f0u)
  l10n: Update Swedish translation (2004t0f0u)
  l10n: zh_CN.po: translate 5 new messages
  l10n: git.pot: v1.8.2 round 3 (5 new)

8 years agoSync with 'maint'
Junio C Hamano [Mon, 25 Feb 2013 16:27:50 +0000 (08:27 -0800)]
Sync with 'maint'

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'wk/user-manual'
Junio C Hamano [Mon, 25 Feb 2013 16:27:17 +0000 (08:27 -0800)]
Merge branch 'wk/user-manual'

Further updates to the user manual.

* wk/user-manual:
  user-manual: Flesh out uncommitted changes and submodule updates
  user-manual: Use request-pull to generate "please pull" text
  user-manual: Reorganize the reroll sections, adding 'git rebase -i'

8 years agoMerge branch 'jn/less-reconfigure'
Junio C Hamano [Mon, 25 Feb 2013 16:27:13 +0000 (08:27 -0800)]
Merge branch 'jn/less-reconfigure'

A change made on v1.8.1.x maintenance track had a nasty regression
to break the build when autoconf is used.

* jn/less-reconfigure:
  Makefile: avoid infinite loop on configure.ac change

8 years agoMerge branch 'as/check-ignore'
Junio C Hamano [Mon, 25 Feb 2013 16:27:09 +0000 (08:27 -0800)]
Merge branch 'as/check-ignore'

"git check-ignore ." segfaulted, as a function it calls deep in its
callchain took a string in the <ptr, length> form but did not stop
when given an empty string.

* as/check-ignore:
  name-hash: allow hashing an empty string
  t0008: document test_expect_success_multi

8 years agoMerge branch 'ct/autoconf-htmldir'
Junio C Hamano [Mon, 25 Feb 2013 16:27:04 +0000 (08:27 -0800)]
Merge branch 'ct/autoconf-htmldir'

An earlier change to config.mak.autogen broke a build driven by the
./configure script when --htmldir is not specified on the command
line of ./configure.

* ct/autoconf-htmldir:
  Bugfix: undefined htmldir in config.mak.autogen

8 years agoMerge branch 'wk/man-deny-current-branch-is-default-these-days'
Junio C Hamano [Mon, 25 Feb 2013 16:26:59 +0000 (08:26 -0800)]
Merge branch 'wk/man-deny-current-branch-is-default-these-days'

* wk/man-deny-current-branch-is-default-these-days:
  user-manual: typofix (ofthe->of the)

8 years agoPrepare for 1.8.1.5
Junio C Hamano [Mon, 25 Feb 2013 16:15:40 +0000 (08:15 -0800)]
Prepare for 1.8.1.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jc/mention-tracking-for-pull-default' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:04:19 +0000 (08:04 -0800)]
Merge branch 'jc/mention-tracking-for-pull-default' into maint

* jc/mention-tracking-for-pull-default:
  doc: mention tracking for pull.default

8 years agoMerge branch 'mm/config-intro-in-git-doc' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:04:17 +0000 (08:04 -0800)]
Merge branch 'mm/config-intro-in-git-doc' into maint

* mm/config-intro-in-git-doc:
  git.txt: update description of the configuration mechanism

8 years agoMerge branch 'da/p4merge-mktemp-fix' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:04:05 +0000 (08:04 -0800)]
Merge branch 'da/p4merge-mktemp-fix' into maint

* da/p4merge-mktemp-fix:
  p4merge: fix printf usage

8 years agoMerge branch 'bw/get-tz-offset-perl' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:04:03 +0000 (08:04 -0800)]
Merge branch 'bw/get-tz-offset-perl' into maint

* bw/get-tz-offset-perl:
  cvsimport: format commit timestamp ourselves without using strftime
  perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
  Move Git::SVN::get_tz to Git::get_tz_offset

8 years agoMerge branch 'al/mergetool-printf-fix' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:04:01 +0000 (08:04 -0800)]
Merge branch 'al/mergetool-printf-fix' into maint

* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %

8 years agoMerge branch 'jx/utf8-printf-width' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:59 +0000 (08:03 -0800)]
Merge branch 'jx/utf8-printf-width' into maint

* jx/utf8-printf-width:
  Add utf8_fprintf helper that returns correct number of columns

8 years agoMerge branch 'mg/bisect-doc' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:57 +0000 (08:03 -0800)]
Merge branch 'mg/bisect-doc' into maint

* mg/bisect-doc:
  git-bisect.txt: clarify that reset quits bisect

8 years agoMerge branch 'sp/smart-http-content-type-check' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:54 +0000 (08:03 -0800)]
Merge branch 'sp/smart-http-content-type-check' into maint

* sp/smart-http-content-type-check:
  http_request: reset "type" strbuf before adding
  t5551: fix expected error output
  Verify Content-Type from smart HTTP servers

8 years agoMerge branch 'jc/combine-diff-many-parents' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:51 +0000 (08:03 -0800)]
Merge branch 'jc/combine-diff-many-parents' into maint

* jc/combine-diff-many-parents:
  t4038: add tests for "diff --cc --raw <trees>"
  combine-diff: lift 32-way limit of combined diff

8 years agoMerge branch 'jk/apply-similaritly-parsing' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:44 +0000 (08:03 -0800)]
Merge branch 'jk/apply-similaritly-parsing' into maint

* jk/apply-similaritly-parsing:
  builtin/apply: tighten (dis)similarity index parsing

8 years agoMerge branch 'jk/remote-helpers-doc' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:37 +0000 (08:03 -0800)]
Merge branch 'jk/remote-helpers-doc' into maint

* jk/remote-helpers-doc:
  Rename {git- => git}remote-helpers.txt

8 years agoMerge branch 'ab/gitweb-use-same-scheme' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:34 +0000 (08:03 -0800)]
Merge branch 'ab/gitweb-use-same-scheme' into maint

* ab/gitweb-use-same-scheme:
  gitweb: refer to picon/gravatar images over the same scheme

8 years agoMerge branch 'zk/clean-report-failure' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:32 +0000 (08:03 -0800)]
Merge branch 'zk/clean-report-failure' into maint

* zk/clean-report-failure:
  git-clean: Display more accurate delete messages

8 years agoMerge branch 'nd/clone-no-separate-git-dir-with-bare' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:27 +0000 (08:03 -0800)]
Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint

* nd/clone-no-separate-git-dir-with-bare:
  clone: forbid --bare --separate-git-dir <dir>

8 years agoMerge branch 'da/p4merge-mktemp' into maint
Junio C Hamano [Mon, 25 Feb 2013 16:03:20 +0000 (08:03 -0800)]
Merge branch 'da/p4merge-mktemp' into maint

* da/p4merge-mktemp:
  mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

8 years agoDocumentation: "advice" is uncountable
Greg Price [Mon, 25 Feb 2013 05:27:20 +0000 (00:27 -0500)]
Documentation: "advice" is uncountable

"Advice" is a mass noun, not a count noun; it's not ordinarily
pluralized.

Signed-off-by: Greg Price <price@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoProvide a mechanism to turn off symlink resolution in ceiling paths
Michael Haggerty [Wed, 20 Feb 2013 09:09:24 +0000 (10:09 +0100)]
Provide a mechanism to turn off symlink resolution in ceiling paths

Commit 1b77d83cab 'setup_git_directory_gently_1(): resolve symlinks
in ceiling paths' changed the setup code to resolve symlinks in the
entries in GIT_CEILING_DIRECTORIES.  Because those entries are
compared textually to the symlink-resolved current directory, an
entry in GIT_CEILING_DIRECTORIES that contained a symlink would have
no effect.  It was known that this could cause performance problems
if the symlink resolution *itself* touched slow filesystems, but it
was thought that such use cases would be unlikely.  The intention of
the earlier change was to deal with a case when the user has this:

GIT_CEILING_DIRECTORIES=/home/gitster

but in reality, /home/gitster is a symbolic link to somewhere else,
e.g. /net/machine/home4/gitster. A textual comparison between the
specified value /home/gitster and the location getcwd(3) returns
would not help us, but readlink("/home/gitster") would still be
fast.

After this change was released, Anders Kaseorg <andersk@mit.edu>
reported:

> [...] my computer has been acting so slow when I’m not connected to
> the network.  I put various network filesystem paths in
> $GIT_CEILING_DIRECTORIES, such as
> /afs/athena.mit.edu/user/a/n/andersk (to avoid hitting its parents
> /afs/athena.mit.edu, /afs/athena.mit.edu/user/a, and
> /afs/athena.mit.edu/user/a/n which all live in different AFS
> volumes).  Now when I’m not connected to the network, every
> invocation of Git, including the __git_ps1 in my shell prompt, waits
> for AFS to timeout.

To allow users to work around this problem, give them a mechanism to
turn off symlink resolution in GIT_CEILING_DIRECTORIES entries.  All
the entries that follow an empty entry will not be checked for symbolic
links and used literally in comparison.  E.g. with these:

GIT_CEILING_DIRECTORIES=:/foo/bar:/xyzzy or
GIT_CEILING_DIRECTORIES=/foo/bar::/xyzzy

we will not readlink("/xyzzy") because it comes after an empty entry.

With the former (but not with the latter), "/foo/bar" comes after an
empty entry, and we will not readlink it, either.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMakefile: avoid infinite loop on configure.ac change
Jeff King [Thu, 21 Feb 2013 06:26:14 +0000 (01:26 -0500)]
Makefile: avoid infinite loop on configure.ac change

If you are using autoconf and change the configure.ac, the
Makefile will notice that config.status is older than
configure.ac, and will attempt to rebuild and re-run the
configure script to pick up your changes. The first step in
doing so is to run "make configure". Unfortunately, this
tries to include config.mak.autogen, which depends on
config.status, which depends on configure.ac; so we must
rebuild config.status. Which leads to us running "make
configure", and so on.

It's easy to demonstrate with:

  make configure
  ./configure
  touch configure.ac
  make

We can break this cycle by not re-invoking make to build
"configure", and instead just putting its rules inline into
our config.status rebuild procedure.  We can avoid a copy by
factoring the rules into a make variable.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoSync with v1.8.1.4
Junio C Hamano [Wed, 20 Feb 2013 05:57:27 +0000 (21:57 -0800)]
Sync with v1.8.1.4

8 years agoGit 1.8.1.4 v1.8.1.4
Junio C Hamano [Tue, 19 Feb 2013 05:48:05 +0000 (05:48 +0000)]
Git 1.8.1.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'ob/imap-send-ssl-verify' into maint
Junio C Hamano [Wed, 20 Feb 2013 05:54:15 +0000 (21:54 -0800)]
Merge branch 'ob/imap-send-ssl-verify' into maint

* ob/imap-send-ssl-verify:
  imap-send: support subjectAltName as well
  imap-send: the subject of SSL certificate must match the host
  imap-send: move #ifdef around

8 years agoimap-send: support subjectAltName as well
Oswald Buddenhagen [Fri, 15 Feb 2013 20:59:53 +0000 (12:59 -0800)]
imap-send: support subjectAltName as well

Check not only the common name of the certificate subject, but also
check the subject alternative DNS names as well, when verifying that
the certificate matches that of the host we are trying to talk to.

Signed-off-by: Oswald Buddenhagen <ossi@kde.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoimap-send: the subject of SSL certificate must match the host
Oswald Buddenhagen [Fri, 15 Feb 2013 20:50:35 +0000 (12:50 -0800)]
imap-send: the subject of SSL certificate must match the host

We did not check a valid certificate's subject at all, and would
have happily talked with a wrong host after connecting to an
incorrect address and getting a valid certificate that does not
belong to the host we intended to talk to.

Signed-off-by: Oswald Buddenhagen <ossi@kde.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agol10n: vi.po: Updated 5 new messages (2009t0f0u)
Tran Ngoc Quan [Wed, 20 Feb 2013 00:16:44 +0000 (07:16 +0700)]
l10n: vi.po: Updated 5 new messages (2009t0f0u)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
8 years agoBugfix: undefined htmldir in config.mak.autogen
Jiang Xin [Tue, 19 Feb 2013 11:23:29 +0000 (19:23 +0800)]
Bugfix: undefined htmldir in config.mak.autogen

Html documents will be installed to root dir (/) no matter what prefix
is set, if run these commands before `make` and `make install-html`:

    $ make configure
    $ ./configure --prefix=<PREFIX>

After the installation, all the html documents will copy to rootdir (/),
and:

    $ git --html-path
    <PREFIX>

    $ git help -w something
    fatal: '<PREFIX>': not a documentation directory.

This is because the variable "htmldir" points to a undefined variable
"$(docdir)" in file "config.mak.autogen", which is generated by running
`./configure`. By default $(docdir) generated by configure is supposed
be set this way:

        datarootdir='${prefix}/share'
        htmldir='${docdir}'
        docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'

but since fc1c5415d69d (Honor configure's htmldir switch, 2013-02-02),
we only set and export htmldir without doing so for PACKAGE_TARNAME
(which is set to 'git' by the configure script).

Add the required two variables "PACKAGE_TARNAME" and "docdir" to file
"config.mak.in" will work this issue around.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoname-hash: allow hashing an empty string
Junio C Hamano [Tue, 19 Feb 2013 19:56:44 +0000 (11:56 -0800)]
name-hash: allow hashing an empty string

Usually we do not pass an empty string to the function hash_name()
because we almost always ask for hash values for a path that is a
candidate to be added to the index. However, check-ignore (and most
likely check-attr, but I didn't check) apparently has a callchain
to ask the hash value for an empty path when it was given a "." from
the top-level directory to ask "Is the path . excluded by default?"

Make sure that hash_name() does not overrun the end of the given
pathname even when it is empty.

Remove a sweep-the-issue-under-the-rug conditional in check-ignore
that avoided to pass an empty string to the callchain while at it.
It is a valid question to ask for check-ignore if the top-level is
set to be ignored by default, even though the answer is most likely
no, if only because there is currently no way to specify such an
entry in the .gitignore file. But it is an unusual thing to ask and
it is not worth optimizing for it by special casing at the top level
of the call chain.

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: Flesh out uncommitted changes and submodule updates
W. Trevor King [Tue, 19 Feb 2013 10:05:02 +0000 (05:05 -0500)]
user-manual: Flesh out uncommitted changes and submodule updates

If you try and update a submodule with a dirty working directory, you
get an error message like:

  $ git submodule update
  error: Your local changes to the following files would be overwritten by checkout:
  ...
  Please, commit your changes or stash them before you can switch branches.
  Aborting
  ...

Mention this in the submodule notes.  The previous phrase was short
enough that I originally thought it might have been referring to the
reflog note (obviously, uncommitted changes will not show up in the
reflog either ;).

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: Use request-pull to generate "please pull" text
W. Trevor King [Tue, 19 Feb 2013 10:05:01 +0000 (05:05 -0500)]
user-manual: Use request-pull to generate "please pull" text

Less work and more error checking (e.g. does a merge base exist?).
Add an explicit push before request-pull to satisfy request-pull,
which checks to make sure the references are publically available.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: Reorganize the reroll sections, adding 'git rebase -i'
W. Trevor King [Tue, 19 Feb 2013 10:05:00 +0000 (05:05 -0500)]
user-manual: Reorganize the reroll sections, adding 'git rebase -i'

I think this interface is often more convenient than extended cherry
picking or using 'git format-patch'.  In fact, I removed the
cherry-pick section entirely.  The entry-level suggestions for
rerolling are now:

    1. git commit --amend
    2. git format-patch origin
       git reset --hard origin
       ...edit and reorder patches...
       git am *.patch
    3. git rebase -i origin

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot0008: document test_expect_success_multi
Adam Spiers [Tue, 19 Feb 2013 14:06:22 +0000 (14:06 +0000)]
t0008: document test_expect_success_multi

test_expect_success_multi() helper function warrants some explanation,
since at first sight it may seem like generic test framework plumbing,
but is in fact specific to testing check-ignore, and allows more
thorough testing of the various output formats without significantly
increase the size of t0008.

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agol10n: Update Swedish translation (2009t0f0u)
Peter Krefting [Tue, 19 Feb 2013 09:26:36 +0000 (10:26 +0100)]
l10n: Update Swedish translation (2009t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
8 years agol10n: Update Swedish translation (2004t0f0u)
Peter Krefting [Mon, 18 Feb 2013 22:01:07 +0000 (23:01 +0100)]
l10n: Update Swedish translation (2004t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
8 years agol10n: zh_CN.po: translate 5 new messages
Jiang Xin [Tue, 19 Feb 2013 06:52:24 +0000 (14:52 +0800)]
l10n: zh_CN.po: translate 5 new messages

Translate 5 new messages came from git.pot update in 235537a
(l10n: git.pot: v1.8.2 round 3 (5 new)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
8 years agol10n: git.pot: v1.8.2 round 3 (5 new)
Jiang Xin [Tue, 19 Feb 2013 05:36:11 +0000 (13:36 +0800)]
l10n: git.pot: v1.8.2 round 3 (5 new)

Generate po/git.pot from v1.8.2-rc0-16-g20a59 for git v1.8.2
l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
8 years agoimap-send: move #ifdef around
Junio C Hamano [Fri, 15 Feb 2013 20:32:19 +0000 (12:32 -0800)]
imap-send: move #ifdef around

Instead of adding an early return to the inside of the
ssl_socket_connect() function for NO_OPENSSL compilation, split it
into a separate stub function.

No functional change, but the next change to extend ssl_socket_connect()
will become easier to read this way.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jc/mention-tracking-for-pull-default'
Junio C Hamano [Tue, 19 Feb 2013 00:05:02 +0000 (16:05 -0800)]
Merge branch 'jc/mention-tracking-for-pull-default'

We stopped mentioning `tracking` is a deprecated but supported
synonym for `upstream` in pull.default even though we have no
intention of removing the support for it.

* jc/mention-tracking-for-pull-default:
  doc: mention tracking for pull.default

8 years agoMerge branch 'mm/config-intro-in-git-doc'
Junio C Hamano [Tue, 19 Feb 2013 00:04:58 +0000 (16:04 -0800)]
Merge branch 'mm/config-intro-in-git-doc'

* mm/config-intro-in-git-doc:
  git.txt: update description of the configuration mechanism

8 years agoRelNotes 1.8.2: push-simple will not be in effect in this release
Junio C Hamano [Mon, 18 Feb 2013 23:59:33 +0000 (15:59 -0800)]
RelNotes 1.8.2: push-simple will not be in effect in this release

Also migration path for the default behaviour of "git add -u/-A" run
in a subdirectory is worth mentioning.

Both pointed out by Matthieu Moy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoshell-prompt: clean up nested if-then
Martin Erik Werner [Mon, 18 Feb 2013 22:59:03 +0000 (23:59 +0100)]
shell-prompt: clean up nested if-then

Minor clean up of if-then nesting in checks for environment variables
and config options. No functional changes.

Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: typofix (ofthe->of the)
Junio C Hamano [Mon, 18 Feb 2013 20:43:00 +0000 (12:43 -0800)]
user-manual: typofix (ofthe->of the)

Noticed by Drew Northup

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Mon, 18 Feb 2013 08:50:33 +0000 (00:50 -0800)]
Merge branch 'maint'

* maint:
  user-manual: use -o latest.tar.gz to create a gzipped tarball
  user-manual: use 'git config --global user.*' for setup
  user-manual: mention 'git remote add' for remote branch config
  user-manual: give 'git push -f' as an alternative to +master
  user-manual: use 'remote add' to setup push URLs

8 years agouser-manual: use -o latest.tar.gz to create a gzipped tarball
W. Trevor King [Mon, 18 Feb 2013 00:16:01 +0000 (19:16 -0500)]
user-manual: use -o latest.tar.gz to create a gzipped tarball

This functionality was introduced by 0e804e09 (archive: provide
builtin .tar.gz filter, 2011-07-21) for v1.7.7.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: use 'git config --global user.*' for setup
W. Trevor King [Mon, 18 Feb 2013 00:15:58 +0000 (19:15 -0500)]
user-manual: use 'git config --global user.*' for setup

A simple command line call is easier than spawning an editor,
especially for folks new to ideas like the "command line" and "text
editors".  This is also the approach suggested by 'git commit' if you
try and commit without having configured user.name or user.email.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: mention 'git remote add' for remote branch config
W. Trevor King [Mon, 18 Feb 2013 00:15:56 +0000 (19:15 -0500)]
user-manual: mention 'git remote add' for remote branch config

I hardly ever setup remote.<name>.url using 'git config'.  While it
may be instructive to do so, we should also point out 'git remote
add'.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: give 'git push -f' as an alternative to +master
W. Trevor King [Mon, 18 Feb 2013 00:15:55 +0000 (19:15 -0500)]
user-manual: give 'git push -f' as an alternative to +master

This mirrors existing language in the description of 'git fetch'.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agouser-manual: use 'remote add' to setup push URLs
W. Trevor King [Mon, 18 Feb 2013 00:15:53 +0000 (19:15 -0500)]
user-manual: use 'remote add' to setup push URLs

There is no need to use here documents to setup this configuration.
It is easier, less confusing, and more robust to use `git remote add`
directly.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Mon, 18 Feb 2013 08:01:12 +0000 (00:01 -0800)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: zh_CN.po: translate 35 new messages
  l10n: vi.po: update new strings (2004t0u0f)
  l10n: Update git.pot (35 new, 14 removed messages)

8 years agol10n: zh_CN.po: translate 35 new messages
Jiang Xin [Thu, 14 Feb 2013 09:47:45 +0000 (17:47 +0800)]
l10n: zh_CN.po: translate 35 new messages

Translate 35 new messages came from git.pot update in 9caaf23
(l10n: Update git.pot (35 new, 14 removed messages)).

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