gitweb.git
Merge branch 'lt/dirwalk' into nextJunio C Hamano Wed, 17 May 2006 22:32:45 +0000 (15:32 -0700)

Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
builtin-add: warn on unmatched pathspecs
Do "git add" as a builtin
Clean up git-ls-file directory walking library interface
libify git-ls-files directory traversal

Not a conflict, but builtin-add needed to be adjusted to properly
invalidate the cache_tree entry.

builtin-add: warn on unmatched pathspecsLinus Torvalds Wed, 17 May 2006 20:23:19 +0000 (13:23 -0700)

builtin-add: warn on unmatched pathspecs

This is in the same spirit as what bba319b5 and 45e48120 tried
to do to help users. A command such as "git add Documentaiton"
with misspelled pathspecs would give a friendly reminder with
this.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Do "git add" as a builtinLinus Torvalds Wed, 17 May 2006 16:33:32 +0000 (09:33 -0700)

Do "git add" as a builtin

First try. Let's see how well this works.

In many ways, the hard parts of "git commit" are not so different from
this, and a builtin commit would share a lot of the code, I think.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/gitlink' into nextJunio C Hamano Wed, 17 May 2006 10:16:50 +0000 (03:16 -0700)

Merge branch 'jc/gitlink' into next

* jc/gitlink:
read-tree: reorganize bind_merge code.

read-tree: reorganize bind_merge code.Junio C Hamano Wed, 17 May 2006 10:16:27 +0000 (03:16 -0700)

read-tree: reorganize bind_merge code.

This does not change the logic but moves the order of checks
around so that merging of read-tree safety code would become
easier.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ew/pretty-fmt' into nextJunio C Hamano Wed, 17 May 2006 10:04:14 +0000 (03:04 -0700)

Merge branch 'ew/pretty-fmt' into next

* ew/pretty-fmt:
commit: allow --pretty= args to be abbreviated

Conflicts:

commit.c - adjust to --pretty=email

Merge branch 'jc/grep' into nextJunio C Hamano Wed, 17 May 2006 09:59:46 +0000 (02:59 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: workaround for non GNU grep.

commit: allow --pretty= args to be abbreviatedEric Wong Mon, 15 May 2006 00:20:46 +0000 (17:20 -0700)

commit: allow --pretty= args to be abbreviated

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-grep: workaround for non GNU grep.Junio C Hamano Wed, 17 May 2006 09:48:13 +0000 (02:48 -0700)

builtin-grep: workaround for non GNU grep.

Some implementations do not know what to do with -H; define
NO_H_OPTION_IN_GREP when you build git if your grep lacks -H.

Most of the time, it can be worked around by prepending
/dev/null to the argument list, but that causes -L and -c to
slightly misbehave (they both expose /dev/null is given), so
when these options are given, do not run external grep that does
not understand -H.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Clean up git-ls-file directory walking library interfaceLinus Torvalds Wed, 17 May 2006 02:46:16 +0000 (19:46 -0700)

Clean up git-ls-file directory walking library interface

This moves the code to add the per-directory ignore files for the base
directory into the library routine.

That not only allows us to turn the function push_exclude_per_directory()
static again, it also simplifies the library interface a lot (the caller
no longer needs to worry about any of the per-directory exclude files at
all).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

libify git-ls-files directory traversalLinus Torvalds Wed, 17 May 2006 02:02:14 +0000 (19:02 -0700)

libify git-ls-files directory traversal

This moves the core directory traversal and filename exclusion logic
into the general git library, making it available for other users
directly.

If we ever want to do "git commit" or "git add" as a built-in (and we
do), we want to be able to handle most of git-ls-files as a library.

NOTE! Not all of git-ls-files is libified by this. The index matching
and pathspec prefix calculation is still in ls-files.c, but this is a
big part of it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Wed, 17 May 2006 00:21:35 +0000 (17:21 -0700)

Merge branch 'master' into next

* master:
Remove old "git-grep.sh" remnants
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base

Remove old "git-grep.sh" remnantsLinus Torvalds Tue, 16 May 2006 23:46:31 +0000 (16:46 -0700)

Remove old "git-grep.sh" remnants

It's built-in now.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'maint'Junio C Hamano Wed, 17 May 2006 00:21:02 +0000 (17:21 -0700)

Merge branch 'maint'

* maint:
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base

Merge branch 'np/pack'Junio C Hamano Wed, 17 May 2006 00:20:24 +0000 (17:20 -0700)

Merge branch 'np/pack'

* np/pack:
improve depth heuristic for maximum delta size
pack-object: slightly more efficient
simple euristic for further free packing improvements

merge-base: Clarify the comments on post processing.Junio C Hamano Wed, 17 May 2006 00:18:22 +0000 (17:18 -0700)

merge-base: Clarify the comments on post processing.

The comment fooled myself believing that we still had an
unsolved horizon effect.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'np/pack' into nextJunio C Hamano Tue, 16 May 2006 21:50:26 +0000 (14:50 -0700)

Merge branch 'np/pack' into next

* np/pack:
improve depth heuristic for maximum delta size

improve depth heuristic for maximum delta sizeNicolas Pitre Tue, 16 May 2006 20:29:14 +0000 (16:29 -0400)

improve depth heuristic for maximum delta size

This provides a linear decrement on the penalty related to delta depth
instead of being an 1/x function. With this another 5% reduction is
observed on packs for both the GIT repo and the Linux kernel repo, as
well as fixing a pack size regression in another sample repo I have.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'se/tag'Junio C Hamano Tue, 16 May 2006 06:43:27 +0000 (23:43 -0700)

Merge branch 'se/tag'

* se/tag:
Strip useless "tags/" prefix from git-tag -l output

Merge branch 'se/rev-parse'Junio C Hamano Tue, 16 May 2006 06:43:23 +0000 (23:43 -0700)

Merge branch 'se/rev-parse'

* se/rev-parse:
Add "--branches", "--tags" and "--remotes" options to git-rev-parse.

Merge branch 'se/diff'Junio C Hamano Tue, 16 May 2006 06:42:37 +0000 (23:42 -0700)

Merge branch 'se/diff'

* se/diff:
Convert some "apply --summary" users to "diff --summary".
Add "--summary" option to git diff.

Merge branch 'se/rebase'Junio C Hamano Tue, 16 May 2006 06:35:24 +0000 (23:35 -0700)

Merge branch 'se/rebase'

* se/rebase:
Make git rebase interactive help match documentation.

Update the documentation for git-merge-baseFredrik Kuivinen Tue, 16 May 2006 05:58:15 +0000 (07:58 +0200)

Update the documentation for git-merge-base

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/diff' into nextJunio C Hamano Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)

Merge branch 'jc/diff' into next

* jc/diff:
builtin-diff: fix comparison between two blobs.

builtin-diff: fix comparison between two blobs.Junio C Hamano Tue, 16 May 2006 02:05:50 +0000 (19:05 -0700)

builtin-diff: fix comparison between two blobs.

The code forgot that setup_revisions() leaves parsed object
names in reverse in the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Tue, 16 May 2006 01:26:34 +0000 (18:26 -0700)

Merge branch 'master' into next

* master:
Fix silly typo in new builtin grep
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems

Merge branch 'lt/oneway'Junio C Hamano Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700)

Merge branch 'lt/oneway'

* lt/oneway:
read-tree --reset -u fix.
read-tree -u one-way merge fix to check out locally modified paths.
Simplify "git reset --hard"
Allow one-way tree merge to remove old files

Merge branch 'ew/send-email'Junio C Hamano Tue, 16 May 2006 01:15:03 +0000 (18:15 -0700)

Merge branch 'ew/send-email'

* ew/send-email:
send-email: quiet some warnings, reject invalid addresses
send-email: allow sendmail binary to be used instead of SMTP

Merge branch 'lt/config'Junio C Hamano Tue, 16 May 2006 01:12:57 +0000 (18:12 -0700)

Merge branch 'lt/config'

* lt/config:

Merge branch 'jc/grep'Junio C Hamano Tue, 16 May 2006 01:12:06 +0000 (18:12 -0700)

Merge branch 'jc/grep'

* jc/grep: (22 commits)
Fix silly typo in new builtin grep
builtin-grep: unparse more command line options.
builtin-grep: use external grep when we can take advantage of it
builtin-grep: -F (--fixed-strings)
builtin-grep: -w fix
builtin-grep: typofix
builtin-grep: tighten argument parsing.
builtin-grep: documentation
Teach -f <file> option to builtin-grep.
builtin-grep: -L (--files-without-match).
builtin-grep: binary files -a and -I
builtin-grep: terminate correctly at EOF
builtin-grep: tighten path wildcard vs tree traversal.
builtin-grep: support -w (--word-regexp).
builtin-grep: support -c (--count).
builtin-grep: allow more than one patterns.
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
builtin-grep: printf %.*s length is int, not ptrdiff_t.
builtin-grep: do not use setup_revisions()
builtin-grep: support '-l' option.
...

Merge branch 'lt/diff'Junio C Hamano Tue, 16 May 2006 01:09:15 +0000 (18:09 -0700)

Merge branch 'lt/diff'

* lt/diff:
git diff: support "-U" and "--unified" options properly

Fix silly typo in new builtin grepLinus Torvalds Tue, 16 May 2006 00:54:01 +0000 (17:54 -0700)

Fix silly typo in new builtin grep

The "-F" flag apparently got mis-translated due to some over-eager
copy-paste work into a duplicate "-H" when using the external grep.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/apply' into nextJunio C Hamano Tue, 16 May 2006 00:58:02 +0000 (17:58 -0700)

Merge branch 'jc/apply' into next

* jc/apply:
git-am: use apply --cached
apply --cached: apply a patch without using working tree.

git-am: use apply --cachedJunio C Hamano Tue, 16 May 2006 00:25:43 +0000 (17:25 -0700)

git-am: use apply --cached

Now 'git apply' can apply patch without working tree, preparation
of pristine preimage and postimage trees that are done when falling
back on 3-way merge by "git am" can do so without temporary files.

Signed-off-by: Junio C Hamano <junkio@cox.net>

apply --cached: apply a patch without using working... Junio C Hamano Mon, 15 May 2006 22:15:47 +0000 (15:15 -0700)

apply --cached: apply a patch without using working tree.

A new flag "--cached" takes the cached data, applies the patch
and stores the result in the index, without using the working
tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/grep' into nextJunio C Hamano Mon, 15 May 2006 20:51:35 +0000 (13:51 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: unparse more command line options.

Merge branch 'ew/send-email' into nextJunio C Hamano Mon, 15 May 2006 20:51:23 +0000 (13:51 -0700)

Merge branch 'ew/send-email' into next

* ew/send-email:
send-email: quiet some warnings, reject invalid addresses
send-email: allow sendmail binary to be used instead of SMTP

Merge branch 'np/pack' into nextJunio C Hamano Mon, 15 May 2006 20:51:09 +0000 (13:51 -0700)

Merge branch 'np/pack' into next

* np/pack:
pack-object: slightly more efficient
simple euristic for further free packing improvements

Merge branch 'lt/oneway' into nextJunio C Hamano Mon, 15 May 2006 20:51:07 +0000 (13:51 -0700)

Merge branch 'lt/oneway' into next

* lt/oneway:
read-tree --reset -u fix.

Merge branch 'fix'Junio C Hamano Mon, 15 May 2006 20:48:22 +0000 (13:48 -0700)

Merge branch 'fix'

* fix:
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).

builtin-grep: unparse more command line options.Junio C Hamano Mon, 15 May 2006 20:28:01 +0000 (13:28 -0700)

builtin-grep: unparse more command line options.

The earlier one to use external grep missed some often used options.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix pack-index issue on 64-bit platforms a bit more... v1.3.3Junio C Hamano Mon, 15 May 2006 19:52:00 +0000 (12:52 -0700)

Fix pack-index issue on 64-bit platforms a bit more portably.

Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use
"unsigned int" -- hopefully that would stay 32-bit on every
platform we care about, at least until we update the pack-index
file format.

Our sha1 routines optimized for architectures use uint32_t and
expects '#include <stdint.h>' to be enough, so OpenBSD on arm or
ppc might have similar issues down the road, I dunno.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Install git-send-email by defaultEric Wong Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)

Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix compilation on newer NetBSD systemsDennis Stosberg Thu, 11 May 2006 17:35:31 +0000 (19:35 +0200)

Fix compilation on newer NetBSD systems

NetBSD >=2.0 has iconv() in libc. A libiconv is not required and
does not exist.

See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0

[jc: with a bit of simplification later discussed on the list.]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-object: slightly more efficientNicolas Pitre Mon, 15 May 2006 17:47:16 +0000 (13:47 -0400)

pack-object: slightly more efficient

Avoid creating a delta index for objects with maximum depth since they
are not going to be used as delta base anyway. This also reduce peak
memory usage slightly as the current object's delta index is not useful
until the next object in the loop is considered for deltification. This
saves a bit more than 1% on CPU usage.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

simple euristic for further free packing improvementsNicolas Pitre Mon, 15 May 2006 15:40:05 +0000 (11:40 -0400)

simple euristic for further free packing improvements

Given that the early eviction of objects with maximum delta depth
may exhibit bad packing on its own, why not considering a bias against
deep base objects in try_delta() to mitigate that bad behavior.

This patch adjust the MAX_size allowed for a delta based on the depth of
the base object as well as enabling the early eviction of max depth
objects from the object window. When used separately, those two things
produce slightly better and much worse results respectively. But their
combined effect is a surprising significant packing improvement.

With this really simple patch the GIT repo gets nearly 15% smaller, and
the Linux kernel repo about 5% smaller, with no significantly measurable
CPU usage difference.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

read-tree --reset -u fix.Linus Torvalds Mon, 15 May 2006 15:09:31 +0000 (08:09 -0700)

read-tree --reset -u fix.

The previous commit makes -u to mean "I do want to remove the
local changes, just update it from the read tree" only for
one-way merge. It makes sense to have it depend on the
"--reset" flag instead.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

send-email: quiet some warnings, reject invalid addressesEric Wong Mon, 15 May 2006 09:41:01 +0000 (02:41 -0700)

send-email: quiet some warnings, reject invalid addresses

I'm not sure why we never actually rejected invalid addresses in
the first place. We just seemed to be using our email validity
checkers to kill duplicates.

Now we just drop invalid email addresses completely and warn
the user about it.

Since we support local sendmail, we'll also accept username-only
addresses.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

send-email: allow sendmail binary to be used instead... Eric Wong Mon, 15 May 2006 09:34:44 +0000 (02:34 -0700)

send-email: allow sendmail binary to be used instead of SMTP

This should make local mailing possible for machines without
a connection to an SMTP server.

It'll default to using /usr/sbin/sendmail or /usr/lib/sendmail
if no SMTP server is specified (the default). If it can't find
either of those paths, it'll fall back to connecting to an SMTP
server on localhost.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'se/tag' into nextJunio C Hamano Mon, 15 May 2006 07:55:31 +0000 (00:55 -0700)

Merge branch 'se/tag' into next

* se/tag:
Strip useless "tags/" prefix from git-tag -l output

Strip useless "tags/" prefix from git-tag -l outputSean Mon, 15 May 2006 00:07:39 +0000 (20:07 -0400)

Strip useless "tags/" prefix from git-tag -l output

Merge branch 'jc/grep' into nextJunio C Hamano Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: use external grep when we can take advantage of it

Merge branch 'jc/apply' into nextJunio C Hamano Mon, 15 May 2006 07:52:20 +0000 (00:52 -0700)

Merge branch 'jc/apply' into next

* jc/apply:
apply --numstat: show new name, not old name.
Ensure author & committer before asking for commit message.
Install git-send-email by default
send-email: address expansion for common mailers
diffstat rename squashing fix.

apply --numstat: show new name, not old name.Junio C Hamano Mon, 15 May 2006 04:59:04 +0000 (21:59 -0700)

apply --numstat: show new name, not old name.

Somehow --stat showed the new name but --numstat showed the old
name for renamed/copied paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Mon, 15 May 2006 07:51:37 +0000 (00:51 -0700)

Merge branch 'fix'

* fix:
Ensure author & committer before asking for commit message.

Merge branch 'fix' into maintJunio C Hamano Mon, 15 May 2006 07:49:25 +0000 (00:49 -0700)

Merge branch 'fix' into maint

* fix:
Ensure author & committer before asking for commit message.

Merge branch 'lt/oneway' into nextJunio C Hamano Mon, 15 May 2006 07:48:00 +0000 (00:48 -0700)

Merge branch 'lt/oneway' into next

* lt/oneway:
read-tree -u one-way merge fix to check out locally modified paths.

read-tree -u one-way merge fix to check out locally... Junio C Hamano Mon, 15 May 2006 07:46:05 +0000 (00:46 -0700)

read-tree -u one-way merge fix to check out locally modified paths.

The "-u" flag means "update the working tree files", but to
other types of merges, it also implies "I want to keep my local
changes" -- because they prevent local changes from getting lost
by using verify_uptodate. The one-way merge is different from
other merges in that its purpose is opposite of doing something
else while keeping unrelated local changes. The point of
one-way merge is to nuke local changes. So while it feels
somewhat wrong that this actively loses local changes, it is the
right thing to do.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Install git-send-email by defaultEric Wong Mon, 15 May 2006 02:26:56 +0000 (19:26 -0700)

Install git-send-email by default

After 567ffeb7722eefab3991cb894c96548b92b57cc2 and
4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no
longer requires any non-standard Perl modules, so there's no
reason to special-case it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

send-email: address expansion for common mailersEric Wong Mon, 15 May 2006 02:13:44 +0000 (19:13 -0700)

send-email: address expansion for common mailers

mutt, gnus, pine, mailrc formats should be supported.

Testing and feedback for correctness and completeness of all formats
and support for additional formats would be good.

Nested expansions are also supported.

More than one alias file to be used.

All alias file formats must still of be the same type, though.

Two git repo-config keys are required for this
(as suggested by Ryan Anderson):

sendemail.aliasesfile = <filename of aliases file>
sendemail.aliasfiletype = (mutt|gnus|pine|mailrc)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-grep: use external grep when we can take advant... Linus Torvalds Mon, 15 May 2006 03:49:15 +0000 (20:49 -0700)

builtin-grep: use external grep when we can take advantage of it

It's not perfect, but it gets the "git grep some-random-string" down to
the good old half-a-second range for the kernel.

It should convert more of the argument flags for "grep", that should be
trivial to expand (I did a few just as an example). It should also bother
to try to return the right "hit" value (which it doesn't, right now - the
code is kind of there, but I didn't actually bother to do it _right_).

Also, right now it _just_ limits by number of arguments, but it should
also strictly speaking limit by total argument size (ie add up the length
of the filenames, and do the "exec_grep()" flush call if it's bigger than
some random value like 32kB).

But I think that it's _conceptually_ doing all the right things, and it
seems to work. So maybe somebody else can do some of the final polish.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diffstat rename squashing fix.Junio C Hamano Mon, 15 May 2006 05:07:28 +0000 (22:07 -0700)

diffstat rename squashing fix.

When renaming leading/a/filename to leading/b/filename (and
"filename" is sufficiently long), we tried to squash the rename
to "leading/{a => b}/filename". However, when "/a" or "/b" part
is empty, we underflowed and tried to print a substring of
length -1.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'se/diff' into nextJunio C Hamano Mon, 15 May 2006 00:12:37 +0000 (17:12 -0700)

Merge branch 'se/diff' into next

* se/diff:
Convert some "apply --summary" users to "diff --summary".
Add "--summary" option to git diff.

Merge branch 'se/rebase' into nextJunio C Hamano Mon, 15 May 2006 00:02:30 +0000 (17:02 -0700)

Merge branch 'se/rebase' into next

* se/rebase:
Make git rebase interactive help match documentation.

Merge branch 'se/rev-parse' into nextJunio C Hamano Sun, 14 May 2006 23:58:59 +0000 (16:58 -0700)

Merge branch 'se/rev-parse' into next

* se/rev-parse:
Add "--branches", "--tags" and "--remotes" options to git-rev-parse.

Merge branch 'lt/oneway' into nextJunio C Hamano Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700)

Merge branch 'lt/oneway' into next

* lt/oneway:
Simplify "git reset --hard"
Allow one-way tree merge to remove old files

Simplify "git reset --hard"Linus Torvalds Sun, 14 May 2006 18:20:37 +0000 (11:20 -0700)

Simplify "git reset --hard"

Now that the one-way merge strategy does the right thing wrt files that do
not exist in the result, just remove all the random crud we did in "git
reset" to do this all by hand.

Instead, just pass in "-u" to git-read-tree when we do a hard reset, and
depend on git-read-tree to update the working tree appropriately.

This basically means that git reset turns into

# Always update the HEAD ref
git update-ref HEAD "$rev"

case "--soft"
# do nothing to index/working tree
case "--hard"
# read index _and_ update working tree
git-read-tree --reset -u "$rev"
case "--mixed"
# update just index, report on working tree differences
git-read-tree --reset "$rev"
git-update-index --refresh

which is what it was always semantically doing, it just did it in a
rather strange way because it was written to not expect git-read-tree to
do anything to the working tree.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Allow one-way tree merge to remove old filesLinus Torvalds Sun, 14 May 2006 17:43:50 +0000 (10:43 -0700)

Allow one-way tree merge to remove old files

For some random reason (probably just because nobody noticed), the one-way
merge strategy didn't mark deleted files as deleted, so if you used

git-read-tree -m -u <newtree>

it would update the files that got changed in the index, but it would not
delete the files that got deleted.

This should fix it, and I can't imagine that anybody depends on the old
strange "update only existing files" behaviour.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'lt/diff' into nextJunio C Hamano Sun, 14 May 2006 23:39:14 +0000 (16:39 -0700)

Merge branch 'lt/diff' into next

* lt/diff:
git diff: support "-U" and "--unified" options properly
include header to define uint32_t, necessary on Mac OS X

Convert some "apply --summary" users to "diff --summary".Sean Sun, 14 May 2006 12:16:06 +0000 (08:16 -0400)

Convert some "apply --summary" users to "diff --summary".

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add "--summary" option to git diff.Sean Sun, 14 May 2006 12:13:49 +0000 (08:13 -0400)

Add "--summary" option to git diff.

Remove the need to pipe git diff through git apply to
get the extended headers summary.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Make git rebase interactive help match documentation.Sean Sun, 14 May 2006 03:34:08 +0000 (23:34 -0400)

Make git rebase interactive help match documentation.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Ensure author & committer before asking for commit... Sean Sun, 14 May 2006 03:09:32 +0000 (23:09 -0400)

Ensure author & committer before asking for commit message.

It's better to find out you need to fix your author and
committer information before you enter a long commit message.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git diff: support "-U" and "--unified" options properlyLinus Torvalds Sat, 13 May 2006 20:23:48 +0000 (13:23 -0700)

git diff: support "-U" and "--unified" options properly

We used to parse "-U" and "--unified" as part of the GIT_DIFF_OPTS
environment variable, but strangely enough we would _not_ parse them as
part of the normal diff command line (where we only accepted "-u").

This adds parsing of -U and --unified, both with an optional numeric
argument. So now you can just say

git diff --unified=5

to get a unified diff with a five-line context, instead of having to do
something silly like

GIT_DIFF_OPTS="--unified=5" git diff -u

(that silly format does continue to still work, of course).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add "--branches", "--tags" and "--remotes" options... Sean Sun, 14 May 2006 01:43:00 +0000 (21:43 -0400)

Add "--branches", "--tags" and "--remotes" options to git-rev-parse.

"git branch" uses "rev-parse --all" and becomes much too slow when
there are many tags (it scans all refs). Use the new "--branches"
option of rev-parse to speed things up.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)

Merge branch 'fix'

* fix:
include header to define uint32_t, necessary on Mac OS X

Merge branch 'fix' into maintJunio C Hamano Sun, 14 May 2006 23:20:09 +0000 (16:20 -0700)

Merge branch 'fix' into maint

* fix:
include header to define uint32_t, necessary on Mac OS X

include header to define uint32_t, necessary on Mac... Ben Clifford Sun, 14 May 2006 20:34:56 +0000 (21:34 +0100)

include header to define uint32_t, necessary on Mac OS X

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ml/cvs'Junio C Hamano Sun, 14 May 2006 07:42:16 +0000 (00:42 -0700)

Merge branch 'ml/cvs'

* ml/cvs:
Change to allow subdir updates from Eclipse
Many fixes for most operations in Eclipse.
Added logged warnings for CVS error returns
cvsserver: use git-rev-list instead of git-log
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.

Merge branch 'fix'Junio C Hamano Sun, 14 May 2006 05:24:18 +0000 (22:24 -0700)

Merge branch 'fix'

* fix:
Fix git-pack-objects for 64-bit platforms

Merge branch 'lt/config' into nextJunio C Hamano Sun, 14 May 2006 01:49:54 +0000 (18:49 -0700)

Merge branch 'lt/config' into next

* lt/config:
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
Fix git-pack-objects for 64-bit platforms
fix diff-delta bad memory access

Merge branch 'lt/fix-config' into lt/configJunio C Hamano Sat, 13 May 2006 21:10:48 +0000 (14:10 -0700)

Merge branch 'lt/fix-config' into lt/config

* lt/fix-config:
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
Fix git-pack-objects for 64-bit platforms

with manual adjustment of t/t1300 for "git repo-config --list" option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git config syntax updatesLinus Torvalds Tue, 9 May 2006 19:24:02 +0000 (12:24 -0700)

git config syntax updates

This updates the hierarchical section name syntax to

[section<space>+"<randomstring>"]

where the only rule for "randomstring" is that it can't contain a newline,
and if you really want to insert a double-quote, you do it with \".

It turns that into the section name "secion.randomstring". The
"section" part is still case insensitive, but the "randomstring"
part is case sensitive.

So you could use this for things like

[email "torvalds@osdl.org"]
name = Linus Torvalds

if you wanted to do the "email->name" conversion as part of the config
file format (I'm not claiming that is sensible, I'm just giving it as an
insane example). That would show up as the association

email.torvalds@osdl.org.name -> Linus Torvalds

which is easy to parse (the "." in the email _looks_ ambiguous, but it
isn't: you know that there will always be a single key-name, so you find
the key name with "strrchr(name, '.')" and things are entirely
unambiguous).

Repo-config is updated to be able to parse the new format, and also
write things out in the new format.

[jc: rolled two patches from Linus and one fix-up from Sean into one,
with additional adjustments for t/t1300 test to check the case
insensitiveness of section base and variable and case sensitiveness
of the extended section part. Then stripped some part off to make
the result applicable to the stale 1.3.X series that does not have
recent enhancements. ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Another config file parsing fix.sean Sat, 6 May 2006 18:14:02 +0000 (14:14 -0400)

Another config file parsing fix.

If the variable we need to store should go into a section
that currently only has a single variable (not matching
the one we're trying to insert), we will already be into
the next section before we notice we've bypassed the correct
location to insert the variable.

To handle this case we store the current location as soon
as we find a variable matching the section of our new
variable.

This breakage was brought up by Linus.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>

checkout: use --aggressive when running a 3-way merge... Junio C Hamano Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)

checkout: use --aggressive when running a 3-way merge (-m).

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix git-pack-objects for 64-bit platformsDennis Stosberg Thu, 11 May 2006 17:36:32 +0000 (19:36 +0200)

Fix git-pack-objects for 64-bit platforms

The offset of an object in the pack is recorded as a 4-byte integer
in the index file. When reading the offset from the mmap'ed index
in prepare_pack_revindex(), the address is dereferenced as a long*.
This works fine as long as the long type is four bytes wide. On
NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing
the offset produces garbage.

[jc: taking suggestion by Linus to use uint32_t]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fix diff-delta bad memory accessNicolas Pitre Wed, 10 May 2006 16:26:08 +0000 (12:26 -0400)

fix diff-delta bad memory access

It cannot be assumed that the given buffer will never be moved when
shrinking the allocated memory size with realloc(). So let's ignore
that optimization for now.

This patch makes Electric Fence happy on Linux.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Wed, 10 May 2006 02:32:08 +0000 (19:32 -0700)

Merge branch 'master' into next

* master:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
read-cache.c: use xcalloc() not calloc()
apply: fix infinite loop with multiple patches with --index

Merge branch 'fix'Junio C Hamano Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700)

Merge branch 'fix'

* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.

checkout: use --aggressive when running a 3-way merge... Junio C Hamano Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)

checkout: use --aggressive when running a 3-way merge (-m).

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

revert/cherry-pick: use aggressive merge.Linus Torvalds Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700)

revert/cherry-pick: use aggressive merge.

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/grep' into nextJunio C Hamano Wed, 10 May 2006 01:29:55 +0000 (18:29 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: -F (--fixed-strings)
builtin-grep: -w fix
builtin-grep: typofix

builtin-grep: -F (--fixed-strings)Junio C Hamano Wed, 10 May 2006 01:28:41 +0000 (18:28 -0700)

builtin-grep: -F (--fixed-strings)

Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-grep: -w fixJunio C Hamano Wed, 10 May 2006 01:27:56 +0000 (18:27 -0700)

builtin-grep: -w fix

Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-grep: typofixJunio C Hamano Wed, 10 May 2006 01:15:21 +0000 (18:15 -0700)

builtin-grep: typofix

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/clean'Junio C Hamano Tue, 9 May 2006 23:52:54 +0000 (16:52 -0700)

Merge branch 'jc/clean'

* jc/clean:
Teach git-clean optional <paths>... parameters.

Merge branch 'mw/alternates'Junio C Hamano Tue, 9 May 2006 23:45:45 +0000 (16:45 -0700)

Merge branch 'mw/alternates'

* mw/alternates:
clone: don't clone the info/alternates file
test case for transitive info/alternates
Transitively read alternatives

Merge branch 'jc/xsha1'Junio C Hamano Tue, 9 May 2006 23:44:59 +0000 (16:44 -0700)

Merge branch 'jc/xsha1'

* jc/xsha1:
get_sha1() - fix infinite loop on nonexistent stage.
get_sha1(): :path and :[0-3]:path to extract from index.

Merge branch 'jc/again'Junio C Hamano Tue, 9 May 2006 23:40:53 +0000 (16:40 -0700)

Merge branch 'jc/again'

* jc/again:
Fix users of prefix_path() to free() only when necessary
update-index --again: take optional pathspecs
update-index --again

Merge branch 'np/delta'Junio C Hamano Tue, 9 May 2006 23:40:28 +0000 (16:40 -0700)

Merge branch 'np/delta'

* np/delta:
improve diff-delta with sparse and/or repetitive data
tiny optimization to diff-delta
replace adler32 with Rabin's polynomial in diff-delta
use delta index data when finding best delta matches
split the diff-delta interface