gitweb.git
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.

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>

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 '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

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

Merge branch 'jc/bindiff'Junio C Hamano Tue, 9 May 2006 21:16:56 +0000 (14:16 -0700)

Merge branch 'jc/bindiff'

* jc/bindiff:
improve base85 generated assembly code
binary diff and apply: testsuite.
binary diff: further updates.
binary patch.

Merge branch 'fix'Junio C Hamano Tue, 9 May 2006 20:54:42 +0000 (13:54 -0700)

Merge branch 'fix'

* fix:
read-cache.c: use xcalloc() not calloc()
apply: fix infinite loop with multiple patches with --index

Merge branch 'jc/grep' into nextJunio C Hamano Tue, 9 May 2006 20:05:53 +0000 (13:05 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: tighten argument parsing.

Merge branch 'ml/cvs' into nextJunio C Hamano Tue, 9 May 2006 20:05:48 +0000 (13:05 -0700)

Merge branch 'ml/cvs' into next

* 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 'tojunio' of locke.catalyst.net.nz/git... Junio C Hamano Tue, 9 May 2006 19:25:21 +0000 (12:25 -0700)

Merge branch 'tojunio' of locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs

* 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff:
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.

read-cache.c: use xcalloc() not calloc()Yakov Lerner Tue, 9 May 2006 16:14:00 +0000 (16:14 +0000)

read-cache.c: use xcalloc() not calloc()

Elsewhere we use xcalloc(); we should consistently do so.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

apply: fix infinite loop with multiple patches with... Eric Wong Tue, 9 May 2006 08:08:23 +0000 (01:08 -0700)

apply: fix infinite loop with multiple patches with --index

When multiple patches are passed to git-apply, it will attempt
to open multiple file descriptors to an index, which means
multiple entries will be in the circular cache_file_list.

This change makes git-apply only open the index once and
write the index at exit.

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

builtin-grep: tighten argument parsing.Junio C Hamano Tue, 9 May 2006 06:55:47 +0000 (23:55 -0700)

builtin-grep: tighten argument parsing.

I mistyped

git grep next -e '"^@"' '*.c'

and got many hits that contain "next" without complaint.
Obviously what I meant to say was:

git grep -e '"^@"' next -- '*.c'

This tightens the argument parsing rule a bit:

- All "grep" parameters should come first;

- If there is no -e nor -f to specify pattern, the first non
option string is the parameter;

- After that, zero or more revs can follow.

- An optional '--' can be present, and is skipped.

- All the rest are pathspecs. If '--' was not there, they must
be paths that exist in the working tree.

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

Merge branch 'jc/clean' into nextJunio C Hamano Mon, 8 May 2006 23:43:23 +0000 (16:43 -0700)

Merge branch 'jc/clean' into next

* jc/clean:
Teach git-clean optional <paths>... parameters.
Separate object name errors from usage errors
Documentation: {caret} fixes (git-rev-list.txt)
Fix "git diff --stat" with long filenames
Fix repo-config set-multivar error return path.

Merge branch 'jc/bindiff' into nextJunio C Hamano Mon, 8 May 2006 23:42:12 +0000 (16:42 -0700)

Merge branch 'jc/bindiff' into next

* jc/bindiff:
improve base85 generated assembly code

Merge branch 'jc/xsha1' into nextJunio C Hamano Mon, 8 May 2006 23:41:15 +0000 (16:41 -0700)

Merge branch 'jc/xsha1' into next

* jc/xsha1:
get_sha1() - fix infinite loop on nonexistent stage.

Merge branch 'jc/grep' into nextJunio C Hamano Mon, 8 May 2006 23:41:10 +0000 (16:41 -0700)

Merge branch 'jc/grep' into next

* jc/grep:
builtin-grep: documentation
Teach -f <file> option to builtin-grep.

Teach git-clean optional <paths>... parameters.Junio C Hamano Mon, 8 May 2006 19:02:44 +0000 (12:02 -0700)

Teach git-clean optional <paths>... parameters.

When optional paths arguments are given, git-clean passes them
to underlying git-ls-files; with this, you can say:

git clean 'temp-*'

to clean only the garbage files whose names begin with 'temp-'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Pavel Roskin <proski@gnu.org>

Merge branch 'fix'Junio C Hamano Mon, 8 May 2006 23:40:23 +0000 (16:40 -0700)

Merge branch 'fix'

* fix:
Separate object name errors from usage errors
Documentation: {caret} fixes (git-rev-list.txt)
Fix "git diff --stat" with long filenames
Fix repo-config set-multivar error return path.

Separate object name errors from usage errorsDmitry V. Levin Mon, 8 May 2006 21:43:38 +0000 (01:43 +0400)

Separate object name errors from usage errors

Separate object name errors from usage errors.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

get_sha1() - fix infinite loop on nonexistent stage.Junio C Hamano Mon, 8 May 2006 22:44:06 +0000 (15:44 -0700)

get_sha1() - fix infinite loop on nonexistent stage.

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

Documentation: {caret} fixes (git-rev-list.txt)Junio C Hamano Mon, 8 May 2006 20:46:53 +0000 (13:46 -0700)

Documentation: {caret} fixes (git-rev-list.txt)

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

builtin-grep: documentationJunio C Hamano Mon, 8 May 2006 20:28:49 +0000 (13:28 -0700)

builtin-grep: documentation

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

Teach -f <file> option to builtin-grep.Junio C Hamano Mon, 8 May 2006 20:28:27 +0000 (13:28 -0700)

Teach -f <file> option to builtin-grep.

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

improve base85 generated assembly codeNicolas Pitre Mon, 8 May 2006 15:31:11 +0000 (11:31 -0400)

improve base85 generated assembly code

This code is arguably pretty hot, if you use binary patches of course.
This patch helps gcc generate both smaller and faster code especially in
the error free path.

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

Fix "git diff --stat" with long filenamesLinus Torvalds Mon, 8 May 2006 16:46:53 +0000 (09:46 -0700)

Fix "git diff --stat" with long filenames

When we cut off the front of a filename to make it fit on the line, we add
a "..." in front. However, the way the "git diff" code was written, we
will never reset the prefix back to the empty string, so every single
filename afterwards will have the "..." prefix, whether appropriate or
not.

You can see this with "git diff v2.6.16.." on the current kernel tree,
since there are filenames with long names that changed there:

[ snip snip ]
Documentation/filesystems/vfs.txt | 229
.../firmware_class/firmware_sample_driver.c | 3
.../firmware_sample_firmware_class.c | 1
...Documentation/fujitsu/frv/kernel-ABI.txt | 192
...Documentation/hwmon/w83627hf | 4
[ snip snip ]

notice how the two Documentation/firmware** filenames caused the "..." to
be added, but then the later filenames don't want it, and it also screws
up the alignment of the line numbering afterwards.

Trivially fixed by moving the declaration (and initial setting) of the
"prefix" variable into the for-loop where it is used.

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

Fix repo-config set-multivar error return path.Junio C Hamano Mon, 8 May 2006 04:27:30 +0000 (21:27 -0700)

Fix repo-config set-multivar error return path.

This hopefully fixes the problem an earlier commit 5d8ee9ceb attemted
to fix.

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

Merge branch 'jc/gitlink' into nextJunio C Hamano Sun, 7 May 2006 23:17:43 +0000 (16:17 -0700)

Merge branch 'jc/gitlink' into next

* jc/gitlink:
write-tree: --prefix=<path>
read-tree: --prefix=<path>/ option.

Merge branch 'mw/alternates' into nextJunio C Hamano Sun, 7 May 2006 23:06:45 +0000 (16:06 -0700)

Merge branch 'mw/alternates' into next

* mw/alternates:
clone: don't clone the info/alternates file
test case for transitive info/alternates
Transitively read alternatives
repack: honor -d even when no new pack was created
clone: keep --reference even with -l -s
repo-config: document what value_regexp does a bit more clearly.
Release config lock if the regex is invalid
core-tutorial.txt: escape asterisk
Sparse fix for builtin-diff
Fix users of prefix_path() to free() only when necessary

Merge branch 'jc/cache-tree' into nextJunio C Hamano Sun, 7 May 2006 23:06:44 +0000 (16:06 -0700)

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
Fix crash when reading the empty tree

clone: don't clone the info/alternates fileMartin Waitz Sun, 7 May 2006 18:19:33 +0000 (20:19 +0200)

clone: don't clone the info/alternates file

Now that the cloned alternates file is parsed, too we don't need to
copy it into our new repository, we just reference it.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

test case for transitive info/alternatesMartin Waitz Sun, 7 May 2006 18:19:47 +0000 (20:19 +0200)

test case for transitive info/alternates

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Transitively read alternativesMartin Waitz Sun, 7 May 2006 18:19:21 +0000 (20:19 +0200)

Transitively read alternatives

When adding an alternate object store then add entries from its
info/alternates files, too.
Relative entries are only allowed in the current repository.
Loops and duplicate alternates through multiple repositories are ignored.
Just to be sure that nothing breaks it is not allow to build deep
nesting levels using info/alternates.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Change to allow subdir updates from EclipseMartyn Smith Tue, 28 Mar 2006 01:24:27 +0000 (13:24 +1200)

Change to allow subdir updates from Eclipse

(Now you can rightclick any directory and select team-update/team-commit) and it should work

Merge branch 'fix'Junio C Hamano Sun, 7 May 2006 22:36:39 +0000 (15:36 -0700)

Merge branch 'fix'

* fix:
repack: honor -d even when no new pack was created
clone: keep --reference even with -l -s
repo-config: document what value_regexp does a bit more clearly.
Release config lock if the regex is invalid
core-tutorial.txt: escape asterisk

Sparse fix for builtin-diffPeter Hagervall Sun, 7 May 2006 14:50:47 +0000 (16:50 +0200)

Sparse fix for builtin-diff

You gotta love sparse:

builtin-diff.c:88:4: error: Just how const do you want this type to be?

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

repack: honor -d even when no new pack was createdMartin Waitz Sun, 7 May 2006 18:18:53 +0000 (20:18 +0200)

repack: honor -d even when no new pack was created

If all objects are reachable via an alternate object store then we
still have to remove all obsolete local packs.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

clone: keep --reference even with -l -sMartin Waitz Sun, 7 May 2006 18:19:09 +0000 (20:19 +0200)

clone: keep --reference even with -l -s

Both -l -s and --reference update objects/info/alternates and used
to write over each other.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Many fixes for most operations in Eclipse.Martyn Smith Mon, 27 Mar 2006 03:51:42 +0000 (15:51 +1200)

Many fixes for most operations in Eclipse.

* Implemented global -n option
* Implemented "Questionable"
* Fixed Directory method, I _believe_ it's now correct in both cmdline and Eclipse.
* Directory method Now looks for localdir of "." and compares the repo dir, uses THIS as a basis for all directory level calculations.
* Added extra parameter to filenamesplit() to force stripping of "prepended" directory name. This ensures commits/updates etc work from any directory in the source tree.
* Modified argsfromdir() so it is "always" called. This means that when the client specifies a directory, the method can detect this and behave accordingly (this is currently only implemented for the '.' directory)
* Fixed "commit" method to correctly work from in a subdir

repo-config: document what value_regexp does a bit... Junio C Hamano Sun, 7 May 2006 22:32:51 +0000 (15:32 -0700)

repo-config: document what value_regexp does a bit more clearly.

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

Release config lock if the regex is invalidPavel Roskin Sun, 7 May 2006 21:36:12 +0000 (17:36 -0400)

Release config lock if the regex is invalid

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Added logged warnings for CVS error returnsMartyn Smith Fri, 17 Mar 2006 00:33:19 +0000 (13:33 +1300)

Added logged warnings for CVS error returns

Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff Sun, 7 May 2006 22:03:37 +0000 (10:03 +1200)

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

core-tutorial.txt: escape asteriskMatthias Lederhofer Sun, 7 May 2006 17:32:53 +0000 (19:32 +0200)

core-tutorial.txt: escape asterisk

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

Fix crash when reading the empty treeJohannes Schindelin Sun, 7 May 2006 15:42:37 +0000 (17:42 +0200)

Fix crash when reading the empty tree

cvsimport needs to call git-read-tree without arguments to create an empty
tree.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'js/fmt-patch' into nextJunio C Hamano Sun, 7 May 2006 04:47:22 +0000 (21:47 -0700)

Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
fmt-patch: understand old <his> notation
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.

Merge branch 'jc/reupdate' into nextJunio C Hamano Sun, 7 May 2006 04:47:07 +0000 (21:47 -0700)

Merge branch 'jc/reupdate' into next

* jc/reupdate:
Fix users of prefix_path() to free() only when necessary

Fix users of prefix_path() to free() only when necessaryJohannes Schindelin Sat, 6 May 2006 22:02:53 +0000 (00:02 +0200)

Fix users of prefix_path() to free() only when necessary

Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer,
and in other cases it returns a substring!

For example, when calling

git update-index ./hello.txt

prefix_path() returns "hello.txt", but does not allocate a new buffer. The
original code only checked if the result of prefix_path() was different from
what was passed in, and thusly trigger a segmentation fault.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix users of prefix_path() to free() only when necessaryJohannes Schindelin Sat, 6 May 2006 22:02:53 +0000 (00:02 +0200)

Fix users of prefix_path() to free() only when necessary

Unfortunately, prefix_path() sometimes returns a newly xmalloc()ed buffer,
and in other cases it returns a substring!

For example, when calling

git update-index ./hello.txt

prefix_path() returns "hello.txt", but does not allocate a new buffer. The
original code only checked if the result of prefix_path() was different from
what was passed in, and thusly trigger a segmentation fault.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fmt-patch: understand old <his> notationJohannes Schindelin Sat, 6 May 2006 20:56:38 +0000 (22:56 +0200)

fmt-patch: understand old <his> notation

When calling "git fmt-patch HEAD~5", you now get the same as if you would
have said "git fmt-patch HEAD~5..". This makes it easier for my fingers
which are so used to the old syntax.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into js/fmt-patchJunio C Hamano Sat, 6 May 2006 21:42:08 +0000 (14:42 -0700)

Merge branch 'master' into js/fmt-patch

* master: (109 commits)
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.
pack-object: squelch eye-candy on non-tty
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.
Clarify git-cherry documentation.
Update git-unpack-objects documentation.
Fix up docs where "--" isn't displayed correctly.
Several trivial documentation touch ups.
git-svn 1.0.0
git-svn: documentation updates
delta: stricter constness
Makefile: do not link rev-list any specially.
builtin-push: --all and --tags _are_ explicit refspecs
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
...

t1300-repo-config: two new config parsing tests.sean Sat, 6 May 2006 19:43:43 +0000 (15:43 -0400)

t1300-repo-config: two new config parsing tests.

- correctly insert a new variable into a section that only
contains a single (different) variable.

- correctly insert a new section that matches the initial
substring of an existing section.

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>

Merge branch 'jc/reupdate' into nextJunio C Hamano Sat, 6 May 2006 07:20:54 +0000 (00:20 -0700)

Merge branch 'jc/reupdate' into next

* jc/reupdate:
update-index --again: take optional pathspecs
update-index --again
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.