gitweb.git
Merge branch 'ae/anon-fetch-info'Junio C Hamano Mon, 18 May 2009 15:59:27 +0000 (08:59 -0700)

Merge branch 'ae/anon-fetch-info'

* ae/anon-fetch-info:
fetch: Strip usernames from url's before storing them

Merge branch 'maint'Junio C Hamano Mon, 18 May 2009 15:59:20 +0000 (08:59 -0700)

Merge branch 'maint'

* maint:
show-branch: Fix die message in parse_reflog_param()

show-branch: Fix die message in parse_reflog_param()Stephen Boyd Sun, 17 May 2009 10:47:02 +0000 (03:47 -0700)

show-branch: Fix die message in parse_reflog_param()

Commit 76a44c5 (show-branch --reflog: show the reflog message at the
top, 2007-01-19) introduced parse_reflog_param(). The die() call was
incorrectly passed arg + 9, when it should have been passed arg.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sun, 17 May 2009 06:08:49 +0000 (23:08 -0700)

Merge branch 'maint'

* maint:
completion: add missing options to show-branch and show
dir.c: clean up handling of 'path' parameter in read_directory_recursive()
Fix type-punning issues

completion: add missing options to show-branch and... Stephen Boyd Sun, 17 May 2009 03:42:43 +0000 (20:42 -0700)

completion: add missing options to show-branch and show

Add --oneline and --abbrev-commit to show and --sparse to show-branch.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

dir.c: clean up handling of 'path' parameter in read_di... Linus Torvalds Thu, 14 May 2009 20:05:03 +0000 (13:05 -0700)

dir.c: clean up handling of 'path' parameter in read_directory_recursive()

Right now we pass two different pathnames ('path' and 'base') down to
read_directory_recursive(), and the only real reason for that is that we
want to allow an empty 'base' parameter, but when we do so, we need the
pathname to "opendir()" to be "." rather than the empty string.

And rather than handle that confusion in the caller, we can just fix
read_directory_recursive() to handle the case of an empty path itself,
by just passing opendir() a "." ourselves if the path is empty.

This would allow us to then drop one of the pathnames entirely from the
calling convention, but rather than do that, we'll start separating them
out as a "filesystem pathname" (the one we use for filesystem accesses)
and a "git internal base name" (which is the name that we use for git
internally).

That will eventually allow us to do things like handle different
encodings (eg the filesystem pathnames might be Latin1, while git itself
would use UTF-8 for filename information).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix type-punning issuesDan McGee Tue, 12 May 2009 01:17:38 +0000 (20:17 -0500)

Fix type-punning issues

In these two places we are casting part of our unsigned char sha1 array into
an unsigned int, which violates GCCs strict-aliasing rules (and probably
other compilers).

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sun, 17 May 2009 02:49:42 +0000 (19:49 -0700)

Merge branch 'maint'

* maint:
test: checkout shouldn't say that HEAD has moved if it didn't
completion: enhance "current branch" display
completion: simplify "current branch" in __git_ps1()
completion: fix PS1 display during a merge on detached HEAD
builtin-checkout: Don't tell user that HEAD has moved before it has
pre-commit.sample: don't print incidental SHA1
tests: Add tests for missing format-patch long options
api-parse-options.txt: use 'func' instead of 'funct'
Turn on USE_ST_TIMESPEC for OpenBSD
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

test: checkout shouldn't say that HEAD has moved if... Nanako Shiraishi Sun, 17 May 2009 02:43:08 +0000 (11:43 +0900)

test: checkout shouldn't say that HEAD has moved if it didn't

Signed-off-by: しらいしななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: enhance "current branch" displayJunio C Hamano Sun, 10 May 2009 08:56:21 +0000 (01:56 -0700)

completion: enhance "current branch" display

Introduce GIT_PS1_DESCRIBE option you can set to "contains", "branch", or
"describe" to tweak the way how a detached HEAD is described.

The default behaviour is to describe only exact match with some tag
(otherwise use the first 7 hexdigits) as before.

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

completion: simplify "current branch" in __git_ps1()Junio C Hamano Sun, 10 May 2009 08:53:19 +0000 (01:53 -0700)

completion: simplify "current branch" in __git_ps1()

As I very often work on a detached HEAD, I found it pretty confusing
when __git_ps1() said 'some-name'. Did I create a branch with that name
by mistake, or do I happen to be on a commit with that exact tag?

This patch fixes the issue by enclosing non branch names in a pair of
parentheses when used to substitute %s token in __git_ps1() argument.

It also fixes a small bug where the branch part is left empty when
.git/HEAD is unreadable for whatever reason. The output now says
"(unknown)".

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

completion: fix PS1 display during a merge on detached... Junio C Hamano Sat, 16 May 2009 18:46:22 +0000 (11:46 -0700)

completion: fix PS1 display during a merge on detached HEAD

If your merge stops in a conflict while on a detached HEAD, recent
completion code fails to show anything. This was because various cases
added to support the operation-in-progress markers (e.g. REBASE, MERGING)
forgot that they need to set the variable "b" to something for the result
they computed to be displayed at all.

Probably not many people make trial merges on a detached HEAD (which is
tremendously useful feature of git, by the way), and that may be why this
was not noticed for a long time.

Acked-By: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Improve the naming of guessed target repository for... Alex Riesen Wed, 13 May 2009 16:32:06 +0000 (18:32 +0200)

Improve the naming of guessed target repository for git clone

Strip leading and trailing spaces off guessed target directory, and
replace sequences of whitespace and 'control' characters with one
space character.

User still can have any name by specifying it explicitely after url.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use UTF-8 instead of utf8 for backward compatibilityAlex Riesen Thu, 14 May 2009 12:55:54 +0000 (14:55 +0200)

Use UTF-8 instead of utf8 for backward compatibility

An old iconv (GNU libiconv 1.11) does not know about utf8, it does know
UTF-8 though, which is also understood by all newer iconv implementations.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin-checkout: Don't tell user that HEAD has moved... Daniel Cordero Sat, 16 May 2009 17:54:45 +0000 (10:54 -0700)

builtin-checkout: Don't tell user that HEAD has moved before it has

Previously, checkout would tell the user this message before moving HEAD,
without regard to whether the upcoming move will result in success.
If the move failed, this causes confusion.

Show the message after the move, unless the move failed.

Signed-off-by: Daniel Cordero <theappleman@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pre-commit.sample: don't print incidental SHA1Jim Meyering Sat, 16 May 2009 10:21:50 +0000 (12:21 +0200)

pre-commit.sample: don't print incidental SHA1

Make the sample pre-commit hook script discard
all git-rev-parse output, not just stderr.
Otherwise, it would print an SHA1.

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

tests: Add tests for missing format-patch long optionsStephen Boyd Sat, 16 May 2009 09:24:45 +0000 (02:24 -0700)

tests: Add tests for missing format-patch long options

Exercise format-patch's --signoff, --in-reply-to and --start-number long
options.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

api-parse-options.txt: use 'func' instead of 'funct'Stephen Boyd Sat, 16 May 2009 09:24:44 +0000 (02:24 -0700)

api-parse-options.txt: use 'func' instead of 'funct'

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Turn on USE_ST_TIMESPEC for OpenBSDTony Kemp Thu, 14 May 2009 06:47:41 +0000 (16:47 +1000)

Turn on USE_ST_TIMESPEC for OpenBSD

Like Darwin, OpenBSD's stat struct uses st_ctimespec and st_mtimestruct
rather than st_ctim and st_mtim.

Signed-off-by: Tony Kemp <tony.kemp@newcastle.edu.au>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.2' into maintJunio C Hamano Sat, 16 May 2009 07:12:58 +0000 (00:12 -0700)

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano Thu, 14 May 2009 04:06:11 +0000 (21:06 -0700)

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Thu, 14 May 2009 04:05:59 +0000 (21:05 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

Quote LF in urls git fetch saves in FETCH_HEADAlex Riesen Wed, 13 May 2009 18:08:53 +0000 (20:08 +0200)

Quote LF in urls git fetch saves in FETCH_HEAD

The fmt-merge-msg does a strong syntax checking of its input and fails
with if it is incorrect. The LF character is the only character
important for fmt-merge-msg. As the url in FETCH_HEAD plays only
informational role, a quoted representation of the url should be good
and true enough.
The url often comes from either user-editable config or command line,
so it is reasonable to expect all kinds of characters in it, including
the characters which the format of FETCH_HEAD considers special (line
separator in this case).

Noticed and reported by Hugo Mildenberger.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clarify / requirement in 'git check... Michael J Gruber Wed, 13 May 2009 15:43:06 +0000 (17:43 +0200)

Documentation: clarify / requirement in 'git check-ref-format'

'git check-ref-format' checks for the presence of at least one '/', the
idea being that there should be no refs directly below 'refs/', so there
should be a category like 'heads/' or 'tags/' in a refname.

Try and make this clearer in the man page.

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

bash completion: complete variable names for "git confi... Stephen Boyd Sat, 9 May 2009 01:23:32 +0000 (18:23 -0700)

bash completion: complete variable names for "git config" with options

This makes it easier for users to get and unset their configuration
variables without having to open documentation or dig through their
configuration file.

__git_config_get_set_variables() retrieves the set configuration
variables from the appropriate configuration file. For example, if
the user has previously specified --global only the global variables
are returned. The same applies for --system, and --file. If no
location has been specified, all set variables are returned.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 13 May 2009 05:51:09 +0000 (22:51 -0700)

Merge branch 'maint'

* maint:
GIT 1.6.3.1
Revert "checkout branch: prime cache-tree fully"

GIT 1.6.3.1 v1.6.3.1Junio C Hamano Wed, 13 May 2009 05:28:22 +0000 (22:28 -0700)

GIT 1.6.3.1

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

Merge branch 'maint-1.6.2' into maintJunio C Hamano Tue, 12 May 2009 16:58:34 +0000 (09:58 -0700)

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
Revert "checkout branch: prime cache-tree fully"

Merge branch 'jc/maint-read-tree-multi' into maint... Junio C Hamano Tue, 12 May 2009 16:58:21 +0000 (09:58 -0700)

Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2

* jc/maint-read-tree-multi:
Revert "checkout branch: prime cache-tree fully"

Revert "checkout branch: prime cache-tree fully"Junio C Hamano Tue, 12 May 2009 16:41:28 +0000 (09:41 -0700)

Revert "checkout branch: prime cache-tree fully"

The logic in 83ae209 (checkout branch: prime cache-tree fully,
2009-04-20) is bogus; checkout can switch branches with a dirty
index and in such a case the tree won't match HEAD.

Add t2014-switch to catch this breakage.

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

t3900: ISO-2022-JP has more than one popular variantsJunio C Hamano Tue, 12 May 2009 09:01:51 +0000 (02:01 -0700)

t3900: ISO-2022-JP has more than one popular variants

When converting from other encodings (e.g. EUC-JP or UTF-8), there are
subtly different variants of ISO-2022-JP, all of which are valid. At the
end of line or when a run of string switches to 1-byte sequence, ESC ( B
can be used to switch to ASCII or ESC ( J can be used to switch to ISO
646:JP (JIS X 0201) but they essentially are the same character set and
are used interchangeably. Similarly the set ESC $ @ switches to (JIS X
0208-1978) and ESC $ B switches to (JIS X 0208-1983) are in practice used
interchangeably.

Depending on the iconv library and the locale definition on the system, a
program that converts from another encoding to ISO-2022-JP can produce
different byte sequence, and GIT_TEST_CMP (aka "diff -u") will report the
difference as a failure.

Fix this by converting the expected and the actual output to UTF-8 before
comparing when the end result is ISO-2022-JP. The test vector string in
t3900/ISO-2022-JP.txt is expressed with ASCII and JIS X 0208-1983, but it
can be expressed with any other possible variant, and when converted back
to UTF-8, these variants produce identical byte sequences.

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

ls-tree manpage: output of ls-tree is compatible with... Alex Riesen Sun, 10 May 2009 16:14:49 +0000 (18:14 +0200)

ls-tree manpage: output of ls-tree is compatible with update-index

Such format relationships are very useful things to remember for
script writers.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

ls-tree manpage: use "unless" instead of "when ...... Alex Riesen Sun, 10 May 2009 16:13:45 +0000 (18:13 +0200)

ls-tree manpage: use "unless" instead of "when ... is not"

Delayed negation in a statement is harder to spot and keep in mind.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sat, 9 May 2009 16:27:43 +0000 (09:27 -0700)

Merge branch 'maint'

* maint:
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning

allow -t abbreviation for --track in git branchSitaram Chamarty Tue, 28 Apr 2009 15:21:20 +0000 (20:51 +0530)

allow -t abbreviation for --track in git branch

also makes it consistent with git-checkout

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

gitweb: Remove function prototypes (cleanup)Jakub Narebski Thu, 7 May 2009 17:11:29 +0000 (19:11 +0200)

gitweb: Remove function prototypes (cleanup)

Use of function prototypes is considered bad practice in Perl. The
ones used here didn't accomplish anything anyhow, so they've been
removed.

>From perlsub(1):

[...] the intent of this feature [prototypes] is primarily to let
you define subroutines that work like built-in functions [...]
you can generate new syntax with it [...]

We don't want to have subroutines behaving exactly like built-in
functions, we don't want to define new syntax / syntactic sugar, so
prototypes in gitweb are not needed... and they can have unintended
consequences.

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

Documentation: cloning to empty directory is allowedAlexander Potashev Thu, 7 May 2009 12:04:08 +0000 (16:04 +0400)

Documentation: cloning to empty directory is allowed

Cloning into an existing empty directory is now allowed:
commit 55892d23981917aefdb387ad7d0429f90cbd446a
("Allow cloning to an existing empty directory")

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Clarify kind of conflict in merge-one-file helperAlex Riesen Wed, 29 Apr 2009 21:40:50 +0000 (23:40 +0200)

Clarify kind of conflict in merge-one-file helper

Not as verbose as the recursive merge driver, but better still.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git config: clarify --add and --get-colorFelipe Contreras Wed, 6 May 2009 22:57:08 +0000 (01:57 +0300)

git config: clarify --add and --get-color

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

archive-tar.c: squelch a type mismatch warningJunio C Hamano Thu, 7 May 2009 08:08:19 +0000 (01:08 -0700)

archive-tar.c: squelch a type mismatch warning

On some systems, giving a value of type time_t to printf "%lo" that
expects an unsigned long would give a type mismatch warning.

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

Start 1.6.4 developmentJunio C Hamano Sat, 9 May 2009 04:56:57 +0000 (21:56 -0700)

Start 1.6.4 development

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

Start 1.6.3.1 maintenance series.Junio C Hamano Sat, 9 May 2009 04:49:14 +0000 (21:49 -0700)

Start 1.6.3.1 maintenance series.

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

Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano Sat, 9 May 2009 04:13:47 +0000 (21:13 -0700)

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sat, 9 May 2009 04:12:41 +0000 (21:12 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
dir.c: Fix two minor grammatical errors in comments

GIT 1.6.3 v1.6.3Junio C Hamano Thu, 7 May 2009 00:13:27 +0000 (17:13 -0700)

GIT 1.6.3

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

t4029: use sh instead of bashNguyễn Thái Ngọc Duy Wed, 6 May 2009 14:33:34 +0000 (00:33 +1000)

t4029: use sh instead of bash

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

t4200: convert sed expression which operates on non... Brandon Casey Wed, 6 May 2009 22:56:18 +0000 (17:56 -0500)

t4200: convert sed expression which operates on non-text file to perl

POSIX only requires sed to work on text files and MERGE_RR is not a text
file. Some versions of sed complain that this file is not newline
terminated, and exit non-zero. Use perl instead which does not have a
problem with it.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4200: remove two unnecessary linesBrandon Casey Wed, 6 May 2009 22:56:17 +0000 (17:56 -0500)

t4200: remove two unnecessary lines

These two lines appear to be unnecessary. They set variables which are not
used afterwards. The primary motivation to remove them is that the sed
invocation exits non-zero for seds which require newline termination of
input files.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/annotate-tests.sh: avoid passing a non-newline termin... Brandon Casey Wed, 6 May 2009 18:29:16 +0000 (13:29 -0500)

t/annotate-tests.sh: avoid passing a non-newline terminated file to sed

Some versions of sed exit non-zero if the file they are supplied is not
newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. So
rework this test to avoid doing so.

This affects tests t8001-annotate.sh and t8002-blame.sh.

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

t4118: avoid sed invocation on file without terminating... Brandon Casey Wed, 6 May 2009 18:29:15 +0000 (13:29 -0500)

t4118: avoid sed invocation on file without terminating newline

Some versions of sed exit non-zero if the file they are supplied is not
newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. In
this case the sed invocation can be avoided entirely since the resulting
file is equivalent to a previously created file. So, just copy that file
into place instead.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4118: add missing '&&'Brandon Casey Wed, 6 May 2009 18:29:14 +0000 (13:29 -0500)

t4118: add missing '&&'

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t8005: use egrep when extended regular expressions... Brandon Casey Wed, 6 May 2009 18:31:42 +0000 (13:31 -0500)

t8005: use egrep when extended regular expressions are required

Not all versions of grep understand backslashed extended regular
expressions. Possibly only gnu grep does.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-clean doc: the command only affects paths under... Junio C Hamano Wed, 6 May 2009 17:48:26 +0000 (10:48 -0700)

git-clean doc: the command only affects paths under $(cwd)

Fredrik Skolmli and Thomas Rast noticed that it was left unstated that
"git clean" ran from a subdirectory will not affect anything outside it,
with or without path limiters.

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

Merge branch 'maint'Junio C Hamano Wed, 6 May 2009 05:52:17 +0000 (22:52 -0700)

Merge branch 'maint'

* maint:
improve error message in config.c
t4018-diff-funcname: add cpp xfuncname pattern to syntax test
Work around BSD whose typeof(tv.tv_sec) != time_t
git-am.txt: reword extra headers in message body
git-am.txt: Use date or value instead of time or timestamp
git-am.txt: add an 'a', say what 'it' is, simplify a sentence
dir.c: Fix two minor grammatical errors in comments
git-svn: fix a sloppy Getopt::Long usage

Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano Wed, 6 May 2009 05:51:49 +0000 (22:51 -0700)

Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

* rj/maint-1.6.0-svn-parse-fix:
git-svn: fix a sloppy Getopt::Long usage

Merge branch 'maint-1.6.0' into maintJunio C Hamano Wed, 6 May 2009 05:51:31 +0000 (22:51 -0700)

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
dir.c: Fix two minor grammatical errors in comments

improve error message in config.cAlex Riesen Wed, 29 Apr 2009 21:27:54 +0000 (23:27 +0200)

improve error message in config.c

Show errno if opening a lockfile fails.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4018-diff-funcname: add cpp xfuncname pattern to synta... Brandon Casey Sat, 2 May 2009 14:31:16 +0000 (09:31 -0500)

t4018-diff-funcname: add cpp xfuncname pattern to syntax test

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers Mon, 6 Apr 2009 17:26:37 +0000 (19:26 +0200)

Work around BSD whose typeof(tv.tv_sec) != time_t

According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD
(and FreeBSD, too) defines it to be a long, which triggers a type
mismatch when a pointer to it is given to localtime_r().

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

git-am.txt: reword extra headers in message bodyStephen Boyd Mon, 4 May 2009 06:46:58 +0000 (23:46 -0700)

git-am.txt: reword extra headers in message body

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-am.txt: Use date or value instead of time or timestampStephen Boyd Tue, 5 May 2009 05:19:00 +0000 (22:19 -0700)

git-am.txt: Use date or value instead of time or timestamp

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-am.txt: add an 'a', say what 'it' is, simplify... Stephen Boyd Tue, 5 May 2009 05:18:42 +0000 (22:18 -0700)

git-am.txt: add an 'a', say what 'it' is, simplify a sentence

It's nice to know that 'it' is git-am or the subject line. Whitespace
implies characters so just remove characters.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: complete values for send-emailStephen Boyd Mon, 4 May 2009 06:25:35 +0000 (23:25 -0700)

completion: complete values for send-email

Add completion for --confirm, --suppress-cc, and --smtp-encryption
command line arguments. Add completion for aliasfiletype and confirm
configuration variables.

Since --smtp-ssl is deprecated, replace it with --smtp-encryption and
the two options ssl and tls.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: complete values for log.dateStephen Boyd Mon, 4 May 2009 06:25:34 +0000 (23:25 -0700)

completion: complete values for log.date

Add raw to the date formats too.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: complete values for help.formatStephen Boyd Mon, 4 May 2009 06:25:33 +0000 (23:25 -0700)

completion: complete values for help.format

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: add {gui,diff,merge}tool, man, and pager... Stephen Boyd Mon, 4 May 2009 06:25:32 +0000 (23:25 -0700)

completion: add {gui,diff,merge}tool, man, and pager config variables

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: add missing configuration variables to... Stephen Boyd Mon, 4 May 2009 06:25:31 +0000 (23:25 -0700)

completion: add missing configuration variables to _git_config()

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

dir.c: Fix two minor grammatical errors in commentsAllan Caffee Mon, 4 May 2009 17:37:30 +0000 (13:37 -0400)

dir.c: Fix two minor grammatical errors in comments

Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson Tue, 5 May 2009 18:16:14 +0000 (11:16 -0700)

git-svn: fix a sloppy Getopt::Long usage

Getopt-Long v2.38 is much stricter about sloppy getopt usage. The
trailing pipe causes git-svn testcases to fail for all of the --stdin
argument calls.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with GIT 1.6.2.5Junio C Hamano Sun, 3 May 2009 23:46:34 +0000 (16:46 -0700)

Sync with GIT 1.6.2.5

GIT 1.6.2.5 v1.6.2.5Junio C Hamano Sun, 3 May 2009 23:14:58 +0000 (16:14 -0700)

GIT 1.6.2.5

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

Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano Sun, 3 May 2009 23:50:47 +0000 (16:50 -0700)

Merge branch 'np/maint-no-ofs-delta' into maint

* np/maint-no-ofs-delta:
honor repack.usedeltabaseoffset when fetching packs

Merge branch 'maint-1.6.1' into maintJunio C Hamano Sun, 3 May 2009 23:14:07 +0000 (16:14 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
GIT 1.6.1.4

Conflicts:
GIT-VERSION-GEN

GIT 1.6.1.4 v1.6.1.4Junio C Hamano Sun, 3 May 2009 22:20:03 +0000 (15:20 -0700)

GIT 1.6.1.4

With a handful of fixes backmerged from 1.6.2.X series

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

Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano Sun, 3 May 2009 22:02:59 +0000 (15:02 -0700)

Merge branch 'jc/maint-read-tree-multi' into maint

* jc/maint-read-tree-multi:
checkout branch: prime cache-tree fully
read-tree -m A B: prime cache-tree from the switched-to tree
Move prime_cache_tree() to cache-tree.c
read-tree A B: do not corrupt cache-tree

Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano Sun, 3 May 2009 22:02:52 +0000 (15:02 -0700)

Merge branch 'mk/maint-apply-swap' into maint

* mk/maint-apply-swap:
tests: make test-apply-criss-cross-rename more robust
builtin-apply: keep information about files to be deleted
tests: test applying criss-cross rename patch

Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano Sun, 3 May 2009 22:02:46 +0000 (15:02 -0700)

Merge branch 'mm/maint-add-p-quit' into maint

* mm/maint-add-p-quit:
git add -p: add missing "q" to patch prompt

Merge branch 'lt/pack-object-memuse' into maintJunio C Hamano Sun, 3 May 2009 22:02:40 +0000 (15:02 -0700)

Merge branch 'lt/pack-object-memuse' into maint

* lt/pack-object-memuse:
show_object(): push path_name() call further down
process_{tree,blob}: show objects without buffering

Merge branch 'jc/maint-1.6.0-keep-pack' into maint... Junio C Hamano Sun, 3 May 2009 22:01:31 +0000 (15:01 -0700)

Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

* jc/maint-1.6.0-keep-pack:
pack-objects: don't loosen objects available in alternate or kept packs
t7700: demonstrate repack flaw which may loosen objects unnecessarily
Remove --kept-pack-only option and associated infrastructure
pack-objects: only repack or loosen objects residing in "local" packs
git-repack.sh: don't use --kept-pack-only option to pack-objects
t7700-repack: add two new tests demonstrating repacking flaws
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable

Merge branch 'jc/maint-1.6.0-diff-borrow-carefully... Junio C Hamano Sun, 3 May 2009 22:01:26 +0000 (15:01 -0700)

Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

* jc/maint-1.6.0-diff-borrow-carefully:
diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged

Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into... Junio C Hamano Sun, 3 May 2009 22:01:19 +0000 (15:01 -0700)

Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1

* bs/maint-1.6.0-tree-walk-prefix:
match_tree_entry(): a pathspec only matches at directory boundaries
tree_entry_interesting: a pathspec only matches at directory boundary

GIT 1.6.3-rc4 v1.6.3-rc4Junio C Hamano Sat, 2 May 2009 06:31:00 +0000 (23:31 -0700)

GIT 1.6.3-rc4

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

honor repack.usedeltabaseoffset when fetching packsNicolas Pitre Sat, 2 May 2009 00:18:02 +0000 (20:18 -0400)

honor repack.usedeltabaseoffset when fetching packs

If the local receiving repository has disabled the use of delta base
offset, for example to retain compatibility with older versions of
Git that predate OFS_DELTA, we shouldn't ask for ofs-delta support
when we obtain a pack from the remote server.

[ issue noticed by Shawn Pearce ]

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://repo.or.cz/git-guiJunio C Hamano Sat, 2 May 2009 05:11:57 +0000 (22:11 -0700)

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
git-gui: Fixes for Mac OS X TkAqua
git-gui: Update Russian translation
git-gui: run post-checkout hook after clone
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
git-gui (Win): make starting via "Git GUI Here" on .git/ possible
git-gui (Win): make "Explore Working Copy" more robust
git-gui: run post-checkout hook on checkout
git-gui: When calling post-commit hook wrong variable was cleared.
git-gui: use `git --html-path` to get the location of installed HTML docs
git-gui: fix deleting from the context menu with empty selection
git-gui: minor spelling fix and string factorisation.
git-gui: various French translation fixes
git-gui: Fix merge conflict display error when filename contains spaces
git-gui: don't hide the Browse button when resizing the repo chooser
Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
git-gui: Support more git version notations.
git-gui: Avoid an infinite rescan loop in handle_empty_diff.
git-gui: Fix post-commit status with subject in non-locale encoding

ctype.c: fix typo in commentRené Scharfe Fri, 1 May 2009 20:03:07 +0000 (22:03 +0200)

ctype.c: fix typo in comment

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

Fix a bunch of pointer declarations (codestyle)Felipe Contreras Fri, 1 May 2009 09:06:36 +0000 (12:06 +0300)

Fix a bunch of pointer declarations (codestyle)

Essentially; s/type* /type */ as per the coding guidelines.

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

git-gui: Fixes for Mac OS X TkAquaDaniel A. Steffen Sat, 16 Aug 2008 01:20:09 +0000 (03:20 +0200)

git-gui: Fixes for Mac OS X TkAqua

- detect more Tk.framework variants
- fix apple menu setup, use native preferences menu item
- don't set menu font

Signed-off-by: Daniel A. Steffen <das@users.sourceforge.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Fri, 1 May 2009 02:56:28 +0000 (19:56 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Add Russian translation
gitk: Fix compare-commits function when we have local changes
gitk: Avoid crash if closed while reading references
gitk: Handle external diff tool with spaces in the path
gitk: Remember and restore the window state with the geometry
gitk: Map KP_Divide to focus the search box
gitk: Mark some more strings for translation
gitk: Mark forgotten string for translation
gitk: Make .gitk a hidden file under windows
gitk: Add a command to compare two strings of commits
gitk: Add a way to mark a commit, plus a "find descendant" command
gitk: Fixes for Mac OS X TkAqua
gitk: Provide a 32x32 window icon based on the git logo
gitk: Provide a window icon if possible
gitk: Handle blobs containing a DOS end-of-file marker

gitk: Add Russian translationAlex Riesen Mon, 27 Apr 2009 18:04:27 +0000 (20:04 +0200)

gitk: Add Russian translation

Thanks go to Dmitry Potapov for proofreading and suggested translation
of the word 'merge'.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

improve error message in config.cAlex Riesen Wed, 29 Apr 2009 21:27:54 +0000 (23:27 +0200)

improve error message in config.c

Show errno if opening a lockfile fails.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)

Merge branch 'maint'

* maint:
diff -c -p: do not die on submodules

Conflicts:
combine-diff.c

daemon.c: fix segfault on OS XBenjamin Kramer Mon, 27 Apr 2009 13:59:49 +0000 (15:59 +0200)

daemon.c: fix segfault on OS X

On OS X (and maybe other unices), getaddrinfo(3) returns NULL
in the ai_canonname field if it's called with an IP address for
the hostname. We'll now use the IP address for the hostname if
ai_canonname was NULL, this also matches the behaviour on Linux.

steps to reproduce:
$ git daemon --export-all
$ git clone git://127.0.0.1/frotz
=> git daemon's fork (silently) segfaults.

Remove the pointless loop while at it. There is only one iteration
because of the break; on the last line and there are no continues.

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-recursive: do not die on a conflicting submoduleJunio C Hamano Wed, 29 Apr 2009 18:08:18 +0000 (11:08 -0700)

merge-recursive: do not die on a conflicting submodule

We cannot represent the 3-way conflicted state in the work tree
for these entries, but it is normal not to have commit objects
for them in our repository. Just update the index and the life
will be good.

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

git config: error when editing a repo config and not... Felipe Contreras Wed, 29 Apr 2009 22:49:47 +0000 (01:49 +0300)

git config: error when editing a repo config and not being in one

Let's throw an error on this specific case. If the user specifies the
config file, he must know what he is doing.

Teemu Likonen pointed this out.

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

parseopt: fix documentation for --keep-dashdashUwe Kleine-König Tue, 28 Apr 2009 20:29:24 +0000 (22:29 +0200)

parseopt: fix documentation for --keep-dashdash

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Rename core.unreliableHardlinks to core.createObjectJohannes Schindelin Mon, 27 Apr 2009 22:32:25 +0000 (00:32 +0200)

Rename core.unreliableHardlinks to core.createObject

"Unreliable hardlinks" is a misleading description for what is happening.
So rename it to something less misleading.

Suggested by Linus Torvalds.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.1' into maintJunio C Hamano Wed, 29 Apr 2009 22:40:33 +0000 (15:40 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
diff -c -p: do not die on submodules

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
diff -c -p: do not die on submodules

diff -c -p: do not die on submodulesJunio C Hamano Wed, 29 Apr 2009 19:49:52 +0000 (12:49 -0700)

diff -c -p: do not die on submodules

The combine diff logic knew only about blobs (and their checked-out form
in the work tree, either regular files or symlinks), and barfed when fed
submodules. This "externalizes" gitlinks in the same way as the normal
patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
issue.

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

git-gui: Update Russian translationAlex Riesen Wed, 29 Apr 2009 05:56:06 +0000 (07:56 +0200)

git-gui: Update Russian translation

Also, the previous translations of the words 'tag' and 'merge' were
changed. Added translation of the 'Tool' submenu.

Thanks go to Alexander Gavrilov and Dmitry Potapov for proofreading
and suggestions.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>