gitweb.git
for-each-ref: Do not lookup objects when they will... Anders Kaseorg Wed, 27 May 2009 19:23:12 +0000 (15:23 -0400)

for-each-ref: Do not lookup objects when they will not be used

This makes commands such as `git for-each-ref --format='%(refname)'`,
which are used heavily by the bash_completion code, run about 6 times
faster on an uncached repository (3 s intead of 18 s on my linux-2.6
repository with several remotes).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Prepare for 1.6.3.2Junio C Hamano Tue, 26 May 2009 02:20:39 +0000 (19:20 -0700)

Prepare for 1.6.3.2

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

Merge branch 'js/maint-no-ln-across-libexec-and-bin... Junio C Hamano Tue, 26 May 2009 02:04:29 +0000 (19:04 -0700)

Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint

* js/maint-no-ln-across-libexec-and-bin:
Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

Conflicts:
Makefile

Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano Tue, 26 May 2009 02:04:08 +0000 (19:04 -0700)

Merge branch 'lt/maint-diff-reduce-lstat' into maint

* lt/maint-diff-reduce-lstat:
Teach 'git checkout' to preload the index contents
Avoid unnecessary 'lstat()' calls in 'get_stat_data()'

Merge branch 'jm/format-patch-no-auto-n-when-k-is-given... Junio C Hamano Tue, 26 May 2009 02:03:52 +0000 (19:03 -0700)

Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint

* jm/format-patch-no-auto-n-when-k-is-given:
format-patch let -k override a config-specified format.numbered

Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano Tue, 26 May 2009 02:03:43 +0000 (19:03 -0700)

Merge branch 'do/maint-merge-recursive-fix' into maint

* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing

Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano Tue, 26 May 2009 02:03:20 +0000 (19:03 -0700)

Merge branch 'jk/maint-1.6.0-trace-argv' into maint

* jk/maint-1.6.0-trace-argv:
fix GIT_TRACE segfault with shell-quoted aliases

Conflicts:
alias.c

Merge branch 'np/push-delta' into maintJunio C Hamano Tue, 26 May 2009 02:02:11 +0000 (19:02 -0700)

Merge branch 'np/push-delta' into maint

* np/push-delta:
allow OFS_DELTA objects during a push

Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)

Merge branch 'ar/merge-one-file-diag' into maint

* ar/merge-one-file-diag:
Clarify kind of conflict in merge-one-file helper

Merge branch 'ar/unlink-err' into maintJunio C Hamano Tue, 26 May 2009 02:01:50 +0000 (19:01 -0700)

Merge branch 'ar/unlink-err' into maint

* ar/unlink-err:
print unlink(2) errno in copy_or_link_directory
replace direct calls to unlink(2) with unlink_or_warn
Introduce an unlink(2) wrapper which gives warning if unlink failed

Merge branch 'jk/maint-add-empty' into maintJunio C Hamano Tue, 26 May 2009 02:01:41 +0000 (19:01 -0700)

Merge branch 'jk/maint-add-empty' into maint

* jk/maint-add-empty:
add: don't complain when adding empty project root

fix cat-file usage message and documentationJeff King Mon, 25 May 2009 10:33:15 +0000 (06:33 -0400)

fix cat-file usage message and documentation

cat-file with an object on the command line requires an
option to tell it what to output (type, size, pretty-print,
etc). However, the square brackets in the usage imply that
those options are not required. This patch switches them to
parentheses to indicate "required but grouped-OR" (curly
braces might also work, but this follows the convention used
already by "git stash").

While we're at it, let's change the <sha1> specifier in the
usage to <object>. That's what the documentation uses, and
it does actually use the regular object lookup.

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

fetch: report ref storage DF errors more accuratelyJeff King Mon, 25 May 2009 10:40:54 +0000 (06:40 -0400)

fetch: report ref storage DF errors more accurately

When we fail to store a fetched ref, we recommend that the
user try running "git prune" to remove up any old refs that
have been deleted by the remote, which would clear up any DF
conflicts. However, ref storage might fail for other
reasons (e.g., permissions problems) in which case the
advice is useless and misleading.

This patch detects when there is an actual DF situation and
only issues the advice when one is found.

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

lock_ref: inform callers of unavailable refJeff King Mon, 25 May 2009 10:37:15 +0000 (06:37 -0400)

lock_ref: inform callers of unavailable ref

One of the ways that locking might fail is that there is a
DF conflict between two refs (e.g., you want to lock
"foo/bar" but "foo" already exists). In this case, we return
an error, but there is no way for the caller to know the
specific problem.

This patch sets errno to ENOTDIR, which is the most sensible
code. It's what we would see if the refs were stored purely
in the filesystem (but these days we must check the
namespace manually due to packed refs).

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

merge-options.txt: Clarify merge --squashMichael J Gruber Mon, 25 May 2009 16:00:10 +0000 (18:00 +0200)

merge-options.txt: Clarify merge --squash

With the --squash option, merge sets up the index just like for a real
merge, but without the merge info (stages). Say so.

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

Merge branch 'maint-1.6.2' into maintJunio C Hamano Sun, 24 May 2009 22:29:33 +0000 (15:29 -0700)

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
http-push.c::remove_locks(): fix use after free

Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano Sun, 24 May 2009 22:29:23 +0000 (15:29 -0700)

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
http-push.c::remove_locks(): fix use after free

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sun, 24 May 2009 22:29:13 +0000 (15:29 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
http-push.c::remove_locks(): fix use after free

http-push.c::remove_locks(): fix use after freeAlex Riesen Sun, 24 May 2009 13:16:49 +0000 (15:16 +0200)

http-push.c::remove_locks(): fix use after free

Noticed and reported by Serhat Şevki Dinçer.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

grep: fix word-regexp colouringRené Scharfe Wed, 20 May 2009 21:31:53 +0000 (23:31 +0200)

grep: fix word-regexp colouring

As noticed by Dmitry Gryazin: When a pattern is found but it doesn't
start and end at word boundaries, bol is forwarded to after the match and
the pattern is searched again. When a pattern is finally found between
word boundaries, the match offsets are off by the number of characters
that have been skipped.

This patch corrects the offsets to be relative to the value of bol as
passed to match_one_pattern() by its caller.

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

completion: use git rev-parse to detect bare reposGiuseppe Bilotta Mon, 18 May 2009 16:24:30 +0000 (18:24 +0200)

completion: use git rev-parse to detect bare repos

Its check is more robust than a config check for core.bare

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

Cope better with a _lot_ of packsJohannes Schindelin Fri, 15 May 2009 18:52:47 +0000 (20:52 +0200)

Cope better with a _lot_ of packs

You might end up with a situation where you have tons of pack files, e.g.
when using hg2git. In this situation, all kinds of operations may
end up with a "too many files open" error. Let's recover gracefully from
that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Looks-right-to-me-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: fix segfault in copy_emailJeff King Mon, 18 May 2009 17:58:11 +0000 (13:58 -0400)

for-each-ref: fix segfault in copy_email

You can trigger a segfault in git.git by doing:

git for-each-ref --format='%(taggeremail)' refs/tags/v0.99

The v0.99 tag is special in that it contains no "tagger"
header.

The bug is obvious in copy_email, which carefully checks to
make sure the result of a strchr is non-NULL, but only after
already having used it to perform other work. The fix is to
move the check up.

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

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>

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>

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>

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"

Add NO_CROSS_DIRECTORY_HARDLINKS support to the MakefileJohannes Schindelin Mon, 11 May 2009 11:02:18 +0000 (13:02 +0200)

Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

When the installed programs are tar'ed up and installed on a system where
bin/ and libexec/git-core/ live on different file systems, we do not want
libexec/git-core/git-* to be hardlinks to bin/git.

Noticed by Cedric Staniewski.

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

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>

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-recursive: never leave index unmerged while recursingDave Olszewski Sat, 9 May 2009 21:49:59 +0000 (14:49 -0700)

merge-recursive: never leave index unmerged while recursing

When you are trying to come up with the final result (i.e. depth=0), you
want to record how the conflict arose by registering the state of the
common ancestor, your branch and the other branch in the index, hence you
want to do update_stages().

When you are merging with positive depth, that is because of a criss-cross
merge situation. In such a case, you would need to record the tentative
result, with conflict markers and all, as if the merge went cleanly, even
if there are conflicts, in order to write it out as a tree object later to
be used as a common ancestor tree.

update_file() calls update_file_flags() with update_cache=1 to signal that
the result needs to be written to the index at stage #0 (i.e. merged), and
the code should not clobber the index further by calling update_stages().

The codepath to deal with rename/delete conflict in a recursive merge
however left the index unmerged.

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

Teach 'git checkout' to preload the index contentsLinus Torvalds Sat, 9 May 2009 22:11:17 +0000 (15:11 -0700)

Teach 'git checkout' to preload the index contents

This makes git checkout know to use the threaded index preloading if it
is enabled in the config file. You need to have

[core]
preloadindex = true

in your config file to see it, and for that feature to make sense your
filesystem needs to be able to do concurrent 'lstat()' lookups, but when
that is the case (especially NFS over a high-latency network), this can
be a noticeable performance win.

But with a low-latency network and at least older Linux NFS clients, this
will clearly potentially cause a lot of lock contention. It may still
speed up the uncached case, but the threading and locking overhead will
result in the cached case likely slowing down.

That was almost certainly fixed by Linux commit fc0f684c2 ("NFS: Remove
BKL from NFS lookup code"), but that one got merged into 2.6.27-rc1, so
older kernel versions than 2.6.27 will not scale very well.

But regardless, it's the right thing to do. If your filesystem doesn't
scale, don't enable index preloading.

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

Avoid unnecessary 'lstat()' calls in 'get_stat_data()'Linus Torvalds Sat, 9 May 2009 21:57:30 +0000 (14:57 -0700)

Avoid unnecessary 'lstat()' calls in 'get_stat_data()'

When we ask get_stat_data() to get the mode and size of an index entry,
we can avoid the lstat() call if we have marked the index entry as being
uptodate due to earlier lstat() calls.

This avoids a lot of unnecessary lstat() calls in eg 'git checkout',
where the last phase shows the differences to the working tree
(requiring a diff), but earlier phases have already verified the index.

On the kernel repo (with a fast machine and everything cached), this
changes timings of a nul 'git checkout' from

- Before (best of ten):

0.14user 0.05system 0:00.19elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+13237minor)pagefaults 0swaps

- After
0.11user 0.03system 0:00.15elapsed 98%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+13235minor)pagefaults 0swaps

so it can obviously be noticeable, although equally obviously it's not a
show-stopper on this particular machine. The difference is likely larger
on slower machines, or with operating systems that don't do as good a job
of name caching.

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

add: don't complain when adding empty project rootJeff King Wed, 29 Apr 2009 03:21:01 +0000 (23:21 -0400)

add: don't complain when adding empty project root

We try to warn the user if one of their pathspecs caused no
matches, as it may have been a typo. However, we disable the
warning if the pathspec points to an existing file, since
that means it is not a typo but simply an empty directory.

Unfortunately, the file_exists() test was broken for one
special case: the pathspec of the project root is just "".
This patch detects this special case and acts as if the file
exists (which it must, since it is the project root).

The user-visible effect is that this:

$ mkdir repo && cd repo && git init && git add .

used to complain like:

fatal: pathspec '' did not match any files

but now is a silent no-op.

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

format-patch let -k override a config-specified format... Jim Meyering Sat, 9 May 2009 08:12:01 +0000 (10:12 +0200)

format-patch let -k override a config-specified format.numbered

Let a command-line --keep-subject (-k) override a config-specified
format.numbered (--numbered (-n)), rather than provoking the
"-n and -k are mutually exclusive" failure.
* t4021-format-patch-numbered.sh: Test for the above

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

fix GIT_TRACE segfault with shell-quoted aliasesJeff King Fri, 8 May 2009 09:06:15 +0000 (05:06 -0400)

fix GIT_TRACE segfault with shell-quoted aliases

The alias argv comes from the split_cmdline function, which
splits the config text for the alias into an array of
strings. It returns the number of elements in the array, but
does not actually put a NULL at the end of the array.
Later, the trace function tries to print this argv and
assumes that it has the trailing NULL.

The split_cmdline function is probably at fault, since argv
lists almost always end with a NULL signal. This patch adds
one, in addition to the returned count; this doesn't hurt
the other callers at all, since they were presumably using
the count already (and will never look at the NULL).

While we're there and using ALLOC_GROW, let's clean up the
other manual grow.

Signed-off-by: Jeff King <peff@peff.net>
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.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

allow OFS_DELTA objects during a pushNicolas Pitre Fri, 1 May 2009 20:56:47 +0000 (16:56 -0400)

allow OFS_DELTA objects during a push

The fetching of OFS_DELTA objects has been negotiated between both peers
since git version 1.4.4. However, this was missing from the push side
where every OFS_DELTA objects were always converted to REF_DELTA objects
causing an increase in transferred data.

To fix this, both the client and the server processes have to be
modified: the former to invoke pack-objects with --delta-base-offset
when the server provides the ofs-delta capability, and the later to send
that capability when OFS_DELTA objects are allowed as already indicated
by the repack.usedeltabaseoffset config variable which is TRUE by
default since git v1.6.0.

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