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

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>

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>

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>

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>

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>

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>

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

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>

binary diff and apply: testsuite.Junio C Hamano Sat, 6 May 2006 07:15:54 +0000 (00:15 -0700)

binary diff and apply: testsuite.

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

update-index --again: take optional pathspecsJunio C Hamano Sat, 6 May 2006 06:09:05 +0000 (23:09 -0700)

update-index --again: take optional pathspecs

When pathspecs are given, update-index --again further limits
the set of paths to be updated to those that match them.

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

update-index --againJunio C Hamano Sat, 6 May 2006 00:40:47 +0000 (17:40 -0700)

update-index --again

After running 'git-update-index' for some paths, you may want to
do the update on the same set of paths again.

The new flag --again checks the paths whose index entries are
are different from the HEAD commit and updates them from the
working tree contents.

This was brought up by Carl Worth on #git.

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

update-index: plug memory leak from prefix_path()Junio C Hamano Sat, 6 May 2006 05:53:56 +0000 (22:53 -0700)

update-index: plug memory leak from prefix_path()

prefix_path() sometimes allocates new memory and returns it, and
other times returns the incoming path argument intact. The
callers need to be a bit careful not to leak memory.

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

checkout-index: plug memory leak from prefix_path()Junio C Hamano Sat, 6 May 2006 05:38:06 +0000 (22:38 -0700)

checkout-index: plug memory leak from prefix_path()

prefix_path() sometimes allocates new memory and returns it, and
other times returns the incoming path argument intact. The
callers need to be a bit careful not to leak memory.

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

update-index --unresolve: work from a subdirectory.Junio C Hamano Sat, 6 May 2006 00:50:06 +0000 (17:50 -0700)

update-index --unresolve: work from a subdirectory.

It completely forgot to take the prefix into account, so you
had to feed the full path even when you start from a
subdirectory, which was nonsensical.

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

binary diff: further updates.Junio C Hamano Fri, 5 May 2006 09:41:53 +0000 (02:41 -0700)

binary diff: further updates.

This updates the user interface and generated diff data format.

* "diff --binary" is used to signal that we want an e-mailable
binary patch. It implies --full-index and -p.

* "apply --allow-binary-replacement" acquired a short synonym
"apply --binary".

* After the "GIT binary patch\n" header line there is a token
to record which binary patch mechanism was used, so that we
can extend it later. Currently there are two mechanisms
defined: "literal" and "delta". The former records the
deflated postimage and the latter records the deflated delta
from the preimage to postimage.

For purely implementation convenience, I added the deflated
length after these "literal/delta" tokens (otherwise the
decoding side needs to guess and reallocate the buffer while
inflating). Improvement patches are very welcomed.

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

binary patch.Junio C Hamano Thu, 4 May 2006 23:51:44 +0000 (16:51 -0700)

binary patch.

This adds "binary patch" to the diff output and teaches apply
what to do with them.

On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line. This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case. However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.

This patch allows the diff to generate "binary" patch when
operating under --full-index option. The binary patch follows
the usual extended git diff headers, and looks like this:

"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"

Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...). <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding. Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters. The payload is the
same diff-delta as we use in the packfiles.

On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.

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

pack-object: squelch eye-candy on non-ttyJunio C Hamano Fri, 5 May 2006 10:20:44 +0000 (03:20 -0700)

pack-object: squelch eye-candy on non-tty

One of my post-update scripts runs a git-fetch into a separate
repository and sends the results back to me (2>&1); I end up
getting this in the mail:

Generating pack...
Done counting 180 objects.
Result has 131 objects.
Deltifying 131 objects.
0% (0/131) done^M 1% (2/131) done^M...

This defaults not to do the progress report when not on a tty.

You could give --progress to force the progress report, but
let's not bother even documenting it nor mentioning it in the
usage string.

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

Merge branch 'fix'Junio C Hamano Fri, 5 May 2006 21:49:49 +0000 (14:49 -0700)

Merge branch 'fix'

* fix:
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.

core.prefersymlinkrefs: use symlinks for .git/HEADJunio C Hamano Tue, 2 May 2006 07:40:24 +0000 (00:40 -0700)

core.prefersymlinkrefs: use symlinks for .git/HEAD

When inspecting a project whose build infrastructure used to
assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs
in the config file of such a project would help to bisect its
history.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 9f0bb90d161edf8c43f5261d12bf83f14eb02ff4 commit)

repo-config: trim white-space before commentJohannes Schindelin Tue, 2 May 2006 14:58:37 +0000 (16:58 +0200)

repo-config: trim white-space before comment

Earlier, calling

git-repo-config core.hello

on a .git/config like this:

[core]
hello = world ; a comment

would yield "world " (i.e. with a trailing space).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80 commit)

Fix for config file section parsing.sean Fri, 5 May 2006 13:49:15 +0000 (09:49 -0400)

Fix for config file section parsing.

Currently, if the target key has a section that matches
the initial substring of another section we mistakenly
believe we've found the correct section. To avoid this
problem, ensure that the section lengths are identical
before comparison.

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

Clarify git-cherry documentation.sean Fri, 5 May 2006 19:06:07 +0000 (15:06 -0400)

Clarify git-cherry documentation.

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

Update git-unpack-objects documentation.sean Fri, 5 May 2006 19:05:36 +0000 (15:05 -0400)

Update git-unpack-objects documentation.

Document that git-unpack-objects will not produce any
results when used on a pack that exists in a repository;
move it first.

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

Fix up docs where "--" isn't displayed correctly.sean Fri, 5 May 2006 19:05:24 +0000 (15:05 -0400)

Fix up docs where "--" isn't displayed correctly.

A bare "--" doesn't show up in man or html pages correctly
as two individual dashes unless backslashed as \--
in the asciidoc source. Note, no backslash is needed
inside a literal block.

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

Several trivial documentation touch ups.sean Fri, 5 May 2006 19:05:10 +0000 (15:05 -0400)

Several trivial documentation touch ups.

Move incorrect asciidoc level 2 titles back to level 1.

Show output of git-name-rev in man page example.

Reword sentences that begin with a period (.) in asciidoc
numbered lists to work around conversion to man page bug.

Mention that git-repack now calls git-prune-packed
when the -d option is passed to it.

[imap] section headers in the config file example need to be
contained in a literal block. imap.pass is the proper config
file variable to use, not imap.password.

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

git-svn 1.0.0Eric Wong Fri, 5 May 2006 19:35:40 +0000 (12:35 -0700)

git-svn 1.0.0

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

git-svn: documentation updatesEric Wong Fri, 5 May 2006 19:35:39 +0000 (12:35 -0700)

git-svn: documentation updates

* Clarify that 'init' requires an argument
* Remove instances of 'SVN_URL' in the manpage, it's not an
environment variable.
* Refer to 'Additional Fetch Arguments' when documenting 'fetch'
* document --authors-file / -A option

Thanks to Pavel Roskin and Seth Falcon for bringing these issues
to my attention.

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

delta: stricter constnessJunio C Hamano Fri, 5 May 2006 09:35:58 +0000 (02:35 -0700)

delta: stricter constness

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

Makefile: do not link rev-list any specially.Junio C Hamano Fri, 5 May 2006 00:38:41 +0000 (17:38 -0700)

Makefile: do not link rev-list any specially.

We used to depend on bignum from openssl for rev-list to compute
merge-order, but there is no reason to use different build
recipe from other programs anymore. Just build it with git-%$X
rule like everybody else.

Noticed by Alexey Dobriyan.

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

builtin-push: --all and --tags _are_ explicit refspecsJohannes Schindelin Thu, 4 May 2006 21:18:14 +0000 (23:18 +0200)

builtin-push: --all and --tags _are_ explicit refspecs

... so do not get refspecs from remotes/* or the config if one of them
was specified.

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

Merge branch 'jc/logs'Junio C Hamano Thu, 4 May 2006 07:04:32 +0000 (00:04 -0700)

Merge branch 'jc/logs'

* jc/logs:
builtin-log/whatchanged/show: make them official.

Merge branch 'jc/show-branch-dense'Junio C Hamano Thu, 4 May 2006 06:58:35 +0000 (23:58 -0700)

Merge branch 'jc/show-branch-dense'

* jc/show-branch-dense:
show-branch: omit uninteresting merges.

Merge branch 'jc/symref'Junio C Hamano Thu, 4 May 2006 06:54:55 +0000 (23:54 -0700)

Merge branch 'jc/symref'

* jc/symref:
core.prefersymlinkrefs: use symlinks for .git/HEAD

Merge branch 'jc/diff'Junio C Hamano Thu, 4 May 2006 06:54:34 +0000 (23:54 -0700)

Merge branch 'jc/diff'

* jc/diff:
builtin-diff: call it "git-diff", really.
builtin-diff.c: die() formatting type fix.
built-in diff: assorted updates.
built-in diff.

Merge branch 'js/repoconfig'Junio C Hamano Thu, 4 May 2006 06:41:28 +0000 (23:41 -0700)

Merge branch 'js/repoconfig'

* js/repoconfig:
repo-config: deconvolute logics
repo-config: readability fixups.
repo-config: support --get-regexp

Merge branch 'jc/count'Junio C Hamano Thu, 4 May 2006 06:40:39 +0000 (23:40 -0700)

Merge branch 'jc/count'

* jc/count:
builtin-count-objects: open packs when running -v
builtin-count-objects: make it official.
built-in count-objects.

Merge branch 'js/remoteconfig'Junio C Hamano Thu, 4 May 2006 06:28:09 +0000 (23:28 -0700)

Merge branch 'js/remoteconfig'

* js/remoteconfig:
Revert "fetch, pull: ask config for remote information"
fetch, pull: ask config for remote information
builtin-push: also ask config for remote information
builtin-push: make it official.
Fix builtin-push to honor Push: lines in remotes file.
builtin-push: resurrect parsing of Push: lines
git builtin "push"

Merge branch 'maint'Junio C Hamano Thu, 4 May 2006 06:00:02 +0000 (23:00 -0700)

Merge branch 'maint'

* maint:
Add a few more words to the glossary.
Added definitions for a few words:
Alphabetize the glossary.

Add a few more words to the glossary. v1.3.2Jon Loeliger Thu, 4 May 2006 04:19:54 +0000 (23:19 -0500)

Add a few more words to the glossary.

Clean up a few entries and fix typos.

bare repository
cherry-picking
hook
topic branch

[jc: removing questionable "symbolic ref -- see 'ref'" for now.]

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Added definitions for a few words:Jon Loeliger Thu, 4 May 2006 04:18:59 +0000 (23:18 -0500)

Added definitions for a few words:

fast forward
pickaxe
refspec
tracking branch

Wild hack allows "link:git-" prefix to reference commands too.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Alphabetize the glossary.Jon Loeliger Thu, 4 May 2006 04:15:46 +0000 (23:15 -0500)

Alphabetize the glossary.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

sha1_to_hex() usage cleanupLinus Torvalds Thu, 4 May 2006 00:21:08 +0000 (17:21 -0700)

sha1_to_hex() usage cleanup

Somebody on the #git channel complained that the sha1_to_hex() thing uses
a static buffer which caused an error message to show the same hex output
twice instead of showing two different ones.

That's pretty easily rectified by making it uses a simple LRU of a few
buffers, which also allows some other users (that were aware of the buffer
re-use) to be written in a more straightforward manner.

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

Merge branch 'fix'Junio C Hamano Thu, 4 May 2006 00:15:06 +0000 (17:15 -0700)

Merge branch 'fix'

* fix:
fix various typos in documentation

blame: Fix path pruningFredrik Kuivinen Wed, 3 May 2006 21:28:46 +0000 (23:28 +0200)

blame: Fix path pruning

This makes git-blame useable again, it has been totally broken for
some time on larger repositories.

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

cvsserver: use git-rev-list instead of git-logMartin Langhoff Wed, 3 May 2006 22:53:37 +0000 (10:53 +1200)

cvsserver: use git-rev-list instead of git-log

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

repo-config: deconvolute logicsJohannes Schindelin Wed, 3 May 2006 12:41:03 +0000 (14:41 +0200)

repo-config: deconvolute logics

It was rightly noticed that the logic is quite convoluted. Fix that.

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

Fix "git-log --parents" breakage post v1.3.0Linus Torvalds Wed, 3 May 2006 14:59:00 +0000 (07:59 -0700)

Fix "git-log --parents" breakage post v1.3.0

Post 1.3.0 "git log" forgets to list parent commits on the first line
when --parents is given. git-cvsserver relied on it.

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

add documentation for update-index --unresolveMatthias Kestenholz Wed, 3 May 2006 10:53:19 +0000 (12:53 +0200)

add documentation for update-index --unresolve

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fix various typos in documentationMatthias Kestenholz Wed, 3 May 2006 10:51:40 +0000 (12:51 +0200)

fix various typos in documentation

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-count-objects: open packs when running -vJunio C Hamano Wed, 3 May 2006 06:03:15 +0000 (23:03 -0700)

builtin-count-objects: open packs when running -v

Otherwise we would report absolutely no objects in a fully
packed repository.

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

improve diff-delta with sparse and/or repetitive dataNicolas Pitre Wed, 3 May 2006 03:31:00 +0000 (23:31 -0400)

improve diff-delta with sparse and/or repetitive data

It is useless to preserve multiple hash entries for consecutive blocks
with the same hash. Keeping only the first one will allow for matching
the longest string of identical bytes while subsequent blocks will only
allow for shorter matches. The backward matching code will match the
end of it as necessary.

This improves both performances (no repeated string compare with long
successions of identical bytes, or even small group of bytes), as well
as compression (less likely to need random hash bucket entry culling),
especially with sparse files.

With well behaved data sets this patch doesn't change much.

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

tiny optimization to diff-deltaNicolas Pitre Wed, 3 May 2006 03:46:51 +0000 (23:46 -0400)

tiny optimization to diff-delta

This is my assembly freak side looking at generated code again. And
since create_delta() is certainly pretty high on the radar every bits
count. In this case shorter code is generated if hash_mask is not
copied to a local variable.

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

repo-config: readability fixups.Junio C Hamano Wed, 3 May 2006 04:06:56 +0000 (21:06 -0700)

repo-config: readability fixups.

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

core.prefersymlinkrefs: use symlinks for .git/HEADJunio C Hamano Tue, 2 May 2006 07:40:24 +0000 (00:40 -0700)

core.prefersymlinkrefs: use symlinks for .git/HEAD

When inspecting a project whose build infrastructure used to
assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs
in the config file of such a project would help to bisect its
history.

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

repo-config: support --get-regexpJohannes Schindelin Tue, 2 May 2006 12:22:48 +0000 (14:22 +0200)

repo-config: support --get-regexp

With --get-regexp, output all key/value pairs where the key matches a
regexp. Example:

git-repo-config --get-regexp remote.*.url

will output something like

remote.junio.url git://git.kernel.org/pub/scm/git/git.git
remote.gitk.url git://git.kernel.org/pub/scm/gitk/gitk.git

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

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Wed, 3 May 2006 03:07:14 +0000 (20:07 -0700)

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

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Allow view to specify arbitrary arguments to git-rev-list
gitk: Fix file list display when files are renamed
gitk: Basic support for highlighting one view within another
gitk: Add a tree-browsing mode
gitk: Use a text widget for the file list
gitk: add menu item for editing the current view
gitk: Implement "permanent" views (stored in ~/.gitk)
gitk: Use git-rev-parse only to identify file/dir names on cmd line
gitk: Remember the view in the history list
gitk: Don't reread git-rev-list output from scratch on view switch
gitk: Fix various bugs in the view support
gitk: Make File->Update work properly again
gitk: Implement multiple views
[PATCH] gitk: Add a visual tag for remote refs

gitk: Allow view to specify arbitrary arguments to... Paul Mackerras Tue, 2 May 2006 23:32:53 +0000 (09:32 +1000)

gitk: Allow view to specify arbitrary arguments to git-rev-list

The list of arguments to git-rev-list, including arguments that
select the range of commits, is now a part of the view specification.
If any arguments are given to gitk, they become part of the
"Command line" view, and the non-file arguments become the default
for any new views created.

Getting an error from git-rev-list is no longer fatal; instead the
error window pops up, and when you press OK, the main window just
shows "No commits selected".

The git-rev-list arguments are entered in an entry widget in the
view editor window using shell quoting conventions, not Tcl quoting
conventions.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'fix'Junio C Hamano Tue, 2 May 2006 22:05:34 +0000 (15:05 -0700)

Merge branch 'fix'

* fix:
git-send-email: fix version string to be valid perl
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

git-send-email: fix version string to be valid perlMartin Langhoff Tue, 2 May 2006 21:44:36 +0000 (09:44 +1200)

git-send-email: fix version string to be valid perl

This makes git-send-email easier to develop and debug, skipping the need
to `make git-send-email` every time.

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

Revert "fetch, pull: ask config for remote information"Junio C Hamano Tue, 2 May 2006 21:16:46 +0000 (14:16 -0700)

Revert "fetch, pull: ask config for remote information"

This reverts 5a223a0d434c874984a0251eca4520ef95718a6d commit.
I asked Johannes to roll an updated version, so let's wait for it.

repo-config: trim white-space before commentJohannes Schindelin Tue, 2 May 2006 14:58:37 +0000 (16:58 +0200)

repo-config: trim white-space before comment

Earlier, calling

git-repo-config core.hello

on a .git/config like this:

[core]
hello = world ; a comment

would yield "world " (i.e. with a trailing space).

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

repo-config: fix segfault with no argument.Johannes Schindelin Tue, 2 May 2006 19:54:12 +0000 (12:54 -0700)

repo-config: fix segfault with no argument.

An earlier addition of --list feature was carelessly done and
caused an invalid access to argv[1] when it was not given.

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

Give the user a hint for how to continue in the case... Robert Shearman Tue, 2 May 2006 12:32:43 +0000 (13:32 +0100)

Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

Give the user a hint for how to continue in the case that git-am fails
because it requires user intervention.

Signed-off-by: Robert Shearman <rob@codeweaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Fix file list display when files are renamedPaul Mackerras Tue, 2 May 2006 09:55:31 +0000 (19:55 +1000)

gitk: Fix file list display when files are renamed

The conversion of the file list to use a text widget assumed incorrectly
that the list of files from git-diff-tree -r would correspond 1-1 with
the diff sections in the output of git-diff-tree -r -p -C, which is
not true when renames are detected. This fixes it by keeping the
elements in the difffilestart list in the order they appear in the
file list window.

Since this means that the elements of difffilestart are no longer
necessarily in ascending order, it's somewhat hard to do the dynamic
highlighting in the file list as the diff window is scrolled, so I
have taken that out for now.

Signed-off-by: Paul Mackerras <paulus@samba.org>

fetch, pull: ask config for remote informationJohannes Schindelin Sun, 30 Apr 2006 13:24:03 +0000 (15:24 +0200)

fetch, pull: ask config for remote information

Now you can say

[remote.junio]
url = git://git.kernel.org/pub/scm/git/git.git
pull = next:next

in your .git/config.

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

builtin-push: also ask config for remote informationJohannes Schindelin Sun, 30 Apr 2006 13:23:48 +0000 (15:23 +0200)

builtin-push: also ask config for remote information

Now you can store your remote information in the config file like this:

[remote.upstream]
url = me@company.com:the-project
push = master:iceballs

[jc: fixed up to adjust a different fix for Push: lines earlier.]

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

builtin-push: make it official.Junio C Hamano Tue, 2 May 2006 06:40:37 +0000 (23:40 -0700)

builtin-push: make it official.

Remove the shell script version, and hardlink the git binary to it.

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

show-branch: omit uninteresting merges.Junio C Hamano Tue, 2 May 2006 00:12:26 +0000 (17:12 -0700)

show-branch: omit uninteresting merges.

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

builtin-log/whatchanged/show: make them official.Junio C Hamano Tue, 2 May 2006 06:14:58 +0000 (23:14 -0700)

builtin-log/whatchanged/show: make them official.

Remove the shell script version, and hardlink the git binary to
them.

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

builtin-diff: call it "git-diff", really.Junio C Hamano Tue, 2 May 2006 05:58:18 +0000 (22:58 -0700)

builtin-diff: call it "git-diff", really.

Call it "git diff" not "git diffn", remove the shell script
version, and hardlink the git binary to it.

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

builtin-count-objects: make it official.Junio C Hamano Tue, 2 May 2006 06:05:39 +0000 (23:05 -0700)

builtin-count-objects: make it official.

Remove the shell-script version, make the hardlink from the git
binary, and update the documentation to describe a new option.

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

Merge branch 'jc/xsha1-2'Junio C Hamano Tue, 2 May 2006 05:55:40 +0000 (22:55 -0700)

Merge branch 'jc/xsha1-2'

* jc/xsha1-2:
Extended SHA1 -- "rev^@" syntax to mean "all parents"

Merge branch 'jc/pack'Junio C Hamano Tue, 2 May 2006 05:54:22 +0000 (22:54 -0700)

Merge branch 'jc/pack'