gitweb.git
rebase -i: work on a detached HEADJohannes Schindelin Tue, 25 Sep 2007 15:43:15 +0000 (16:43 +0100)

rebase -i: work on a detached HEAD

Earlier, rebase -i refused to rebase a detached HEAD. Now it no longer
does.

Incidentally, this fixes "git gc --auto" shadowing the true exit status.

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

Merge branch 'jc/autogc' into js/rebase-iJunio C Hamano Wed, 26 Sep 2007 07:42:12 +0000 (00:42 -0700)

Merge branch 'jc/autogc' into js/rebase-i

* jc/autogc:
git-gc --auto: run "repack -A -d -l" as necessary.
git-gc --auto: restructure the way "repack" command line is built.
git-gc --auto: protect ourselves from accumulated cruft
git-gc --auto: add documentation.
git-gc --auto: move threshold check to need_to_gc() function.
repack -A -d: use --keep-unreachable when repacking
pack-objects --keep-unreachable
Export matches_pack_name() and fix its return value
Invoke "git gc --auto" from commit, merge, am and rebase.
Implement git gc --auto

Conflicts:

builtin-pack-objects.c

rebase -i: create .dotest-merge after validating options.Matt Kraai Wed, 26 Sep 2007 01:30:13 +0000 (18:30 -0700)

rebase -i: create .dotest-merge after validating options.

Creating .dotest-merge before validating the options prevents both
--continue and --interactive from working if the options are invalid,
so only create it after validating the options.

[jc: however, just moving the creation of DOTEST breaks output]

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -i: avoid exporting GIT_AUTHOR_* variablesJohannes Schindelin Tue, 25 Sep 2007 15:43:44 +0000 (16:43 +0100)

rebase -i: avoid exporting GIT_AUTHOR_* variables

It is somewhat unsafe to export the GIT_AUTHOR_* variables, since a later
call to git-commit or git-merge could pick them up inadvertently.

So avoid the export, using a recipe provided by Johannes Sixt.

Incidentally, this fixes authorship of merges with "rebase --preserve -i".

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

rebase -i: Fix numbers in progress reportJohannes Schindelin Tue, 25 Sep 2007 15:43:04 +0000 (16:43 +0100)

rebase -i: Fix numbers in progress report

Instead of counting all lines in done and todo, we now count the actions
before outputting "$Rebasing ($count/$total)".

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

rebase -i: style fixes and minor cleanupsJohannes Schindelin Tue, 25 Sep 2007 15:42:51 +0000 (16:42 +0100)

rebase -i: style fixes and minor cleanups

This patch indents ";;" consistently with the rest of git's shell scripts,
and makes sure that ";;" are before each "esac".

It introduces a helper function "has_action", to make it easier to read
the intentions of the code.

Errors from "git rev-parse --verify" are no longer ignored.

Spaces are quoted using single quotes instead of a backslash, for
readability.

A "test $preserve=f" (missing spaces) was fixed; hashes are no longer
written to "$DOTEST"/rewritten/ unnecessarily.

We used to quote the message for a squash, only to have "echo" unquote it.
Now we use "printf" and do not need to quote to start with.

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

rebase -i: commit when continuing after "edit"Johannes Schindelin Tue, 25 Sep 2007 15:42:36 +0000 (16:42 +0100)

rebase -i: commit when continuing after "edit"

When doing an "edit" on a commit, editing and git-adding some files,
"git rebase -i" complained about a missing "author-script". The idea was
that the user would call "git commit --amend" herself.

But we can be nice and do that for the user.

Noticed by Dmitry Potapov.

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

Make merge-recursive honor diff.renamelimitLars Hjemli Tue, 25 Sep 2007 06:36:38 +0000 (08:36 +0200)

Make merge-recursive honor diff.renamelimit

It might be a sign of source code management gone bad, but when two branches
has diverged almost beyond recognition and time has come for the branches to
merge, the user is going to need all the help his tool can give him. Honoring
diff.renamelimit has great potential as a painkiller in such situations.

The painkiller effect could have been achieved by e.g. 'merge.renamelimit',
but the flexibility gained by a separate option is questionable: our user
would probably expect git to detect renames equally good when merging as
when diffing (I known I did).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Move convert-objects to contrib.Matt Kraai Tue, 25 Sep 2007 14:03:46 +0000 (07:03 -0700)

Move convert-objects to contrib.

convert-objects was needed to convert from an old-style repository,
which hashed the compressed contents and used a different date format.
Such repositories are presumably no longer common and, if such
conversions are necessary, should be done by writing a frontend for
git-fast-import.

Linus, the original author, is OK with moving it to contrib.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 25 Sep 2007 07:30:33 +0000 (00:30 -0700)

Merge branch 'maint'

* maint:
Do not over-quote the -f envelopesender value.
unexpected Make output (e.g. from --debug) causes build failure
Fixed minor typo in t/t9001-send-email.sh test command line.

Do not over-quote the -f envelopesender value.Jim Meyering Tue, 25 Sep 2007 06:48:59 +0000 (08:48 +0200)

Do not over-quote the -f envelopesender value.

Without this, the value passed to sendmail would have an extra set of
single quotes. At least exim's sendmail emulation would object to that:

exim: bad -f address "'list-addr@example.org'": malformed address: ' \
may not follow 'list-addr@example.org
error: hooks/post-receive exited with error code 1

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

unexpected Make output (e.g. from --debug) causes build... Jim Meyering Tue, 25 Sep 2007 06:42:16 +0000 (08:42 +0200)

unexpected Make output (e.g. from --debug) causes build failure

Without this, the extra output produced e.g., by "make --debug"
would go into $INSTLIBDIR and then cause the sed command to fail.

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

Fixed minor typo in t/t9001-send-email.sh test command... Glenn Rempe Mon, 24 Sep 2007 20:33:38 +0000 (13:33 -0700)

Fixed minor typo in t/t9001-send-email.sh test command line.

The git-send-email command line in the test was missing a single hyphen.

Signed-off-by: Glenn Rempe <glenn@rempe.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Start RelNotes for 1.5.4Junio C Hamano Mon, 24 Sep 2007 08:12:16 +0000 (01:12 -0700)

Start RelNotes for 1.5.4

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

Merge branch 'jn/web'Junio C Hamano Mon, 24 Sep 2007 06:13:08 +0000 (23:13 -0700)

Merge branch 'jn/web'

* jn/web:
gitweb: No difftree output for trivial merge
gitweb: Remove parse_from_to_diffinfo code from git_patchset_body

gitweb: No difftree output for trivial mergeJakub Narebski Sat, 8 Sep 2007 19:54:28 +0000 (21:54 +0200)

gitweb: No difftree output for trivial merge

In 'commitdiff' view, for the merge commit, there is an extra header
for the difftree table, with links to commitdiffs to individual
parents. Do not show such header when there is nothing to show, for
trivial merges.

This means that for trivial merge you have to go to 'commit' view
to get links to diffs to each parent.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>

gitweb: Remove parse_from_to_diffinfo code from git_pat... Jakub Narebski Sat, 8 Sep 2007 19:49:11 +0000 (21:49 +0200)

gitweb: Remove parse_from_to_diffinfo code from git_patchset_body

In commit 90921740bd00029708370673fdc537522aa48e6f
"gitweb: Split git_patchset_body into separate subroutines"
a part of git_patchset_body code was separated into parse_from_to_diffinfo
subroutine. But instead of replacing the separated code by the call to
mentioned subroutine, the call to subroutine was placed before the separated
code. This patch removes parse_from_to_diffinfo code from git_patchset_body
subroutine.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>

Merge branch 'je/hooks'Junio C Hamano Mon, 24 Sep 2007 05:51:03 +0000 (22:51 -0700)

Merge branch 'je/hooks'

* je/hooks:
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.

Merge branch 'js/apply-build-ancestor'Junio C Hamano Mon, 24 Sep 2007 04:16:33 +0000 (21:16 -0700)

Merge branch 'js/apply-build-ancestor'

* js/apply-build-ancestor:
apply: get rid of --index-info in favor of --build-fake-ancestor

Merge branch 'maint'Junio C Hamano Mon, 24 Sep 2007 00:13:55 +0000 (17:13 -0700)

Merge branch 'maint'

* maint:
git-svn: don't attempt to spawn pager if we don't want one
Supplant the "while case ... break ;; esac" idiom
User Manual: add a chapter for submodules
user-manual: don't assume refs are stored under .git/refs
Detect exec bit in more cases.
Conjugate "search" correctly in the git-prune-packed man page.
Move the paragraph specifying where the .idx and .pack files should be
Documentation/git-lost-found.txt: drop unnecessarily duplicated name.

Merge branch 'maint' of git://linux-nfs.org/~bfields... Junio C Hamano Mon, 24 Sep 2007 00:08:45 +0000 (17:08 -0700)

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
User Manual: add a chapter for submodules
user-manual: don't assume refs are stored under .git/refs

git-svn: don't attempt to spawn pager if we don't want oneEric Wong Sat, 22 Sep 2007 01:48:45 +0000 (18:48 -0700)

git-svn: don't attempt to spawn pager if we don't want one

Even though config_pager() unset the $pager variable, we were
blindly calling exec() on it through run_pager().

Noticed-by: Chris Moore <christopher.ian.moore@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Supplant the "while case ... break ;; esac" idiomDavid Kastrup Sun, 23 Sep 2007 20:42:08 +0000 (22:42 +0200)

Supplant the "while case ... break ;; esac" idiom

A lot of shell scripts contained stuff starting with

while case "$#" in 0) break ;; esac

and similar. I consider breaking out of the condition instead of the
body od the loop ugly, and the implied "true" value of the
non-matching case is not really obvious to humans at first glance. It
happens not to be obvious to some BSD shells, either, but that's
because they are not POSIX-compliant. In most cases, this has been
replaced by a straight condition using "test". "case" has the
advantage of being faster than "test" on vintage shells where "test"
is not a builtin. Since none of them is likely to run the git
scripts, anyway, the added readability should be worth the change.

A few loops have had their termination condition expressed
differently.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

User Manual: add a chapter for submodulesMiklos Vajna Thu, 20 Sep 2007 00:34:14 +0000 (02:34 +0200)

User Manual: add a chapter for submodules

Signed-off-by: Michael Smith <msmith@cbnco.com>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: don't assume refs are stored under .git... J. Bruce Fields Mon, 10 Sep 2007 02:07:02 +0000 (22:07 -0400)

user-manual: don't assume refs are stored under .git/refs

The scripts taken from Tony Luck's howto assume all refs can be found
under .git/refs, but this is not necessarily true, especially since
git-gc runs git-pack-refs.

Also add a note warning of this in the chapter that introduces refs, and
fix the same incorrect assumption in one other spot.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

Detect exec bit in more cases.David Brown Wed, 19 Sep 2007 20:12:48 +0000 (13:12 -0700)

Detect exec bit in more cases.

git-p4 was missing the execute bit setting if the file had other attribute
bits set.

Acked-By: Simon Hausmann <simon@lst.de>

Conjugate "search" correctly in the git-prune-packed... Matt Kraai Fri, 21 Sep 2007 14:37:18 +0000 (07:37 -0700)

Conjugate "search" correctly in the git-prune-packed man page.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Move the paragraph specifying where the .idx and .pack... Matt Kraai Fri, 21 Sep 2007 13:43:44 +0000 (06:43 -0700)

Move the paragraph specifying where the .idx and .pack files should be

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-lost-found.txt: drop unnecessarily... Junio C Hamano Fri, 21 Sep 2007 19:52:30 +0000 (12:52 -0700)

Documentation/git-lost-found.txt: drop unnecessarily duplicated name.

I only did this back when I wanted to make sure git-log and gitk work
properly with non Occidental characters. There is really no reason to
keep it around.

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

rev-list --bisect: Fix best == NULL case.Christian Couder Thu, 20 Sep 2007 05:23:01 +0000 (07:23 +0200)

rev-list --bisect: Fix best == NULL case.

Earlier commit ce0cbad77 broke rev-list --bisect to cause it
segfault when the resulting set is empty.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint' to sync with 1.5.3.2Junio C Hamano Wed, 19 Sep 2007 10:21:35 +0000 (03:21 -0700)

Merge branch 'maint' to sync with 1.5.3.2

This is an evil merge that also updates the stale document links
in Documentation/git.txt

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

GIT 1.5.3.2 v1.5.3.2Junio C Hamano Wed, 19 Sep 2007 10:11:28 +0000 (03:11 -0700)

GIT 1.5.3.2

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

apply: get rid of --index-info in favor of --build... Johannes Schindelin Mon, 17 Sep 2007 22:34:06 +0000 (23:34 +0100)

apply: get rid of --index-info in favor of --build-fake-ancestor

git-am used "git apply -z --index-info" to find the original versions
of the files touched by the diff, to be able to do an inexpensive
three-way merge.

This operation makes only sense in a repository, since the index
information in the diff refers to blobs, which have to be present in
the current repository.

Therefore, teach "git apply" a mode to write out the result as an
index file to begin with, obviating the need for scripts to do it
themselves.

The sole user for --index-info is "git am" is converted to
use --build-fake-ancestor in this patch.

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

Added example hook script to save/restore permissions... Josh England Tue, 11 Sep 2007 16:59:04 +0000 (10:59 -0600)

Added example hook script to save/restore permissions/ownership.

Usage info is emebed in the script, but the gist of it is to run the script
from a pre-commit hook to save permissions/ownership data to a file and check
that file into the repository. Then, a post_merge hook reads the file and
updates working tree permissions/ownership. All updates are transparent to
the user (although there is a --verbose option). Merge conflicts are handled
in the "read" phase (in pre-commit), and the script aborts the commit and
tells you how to fix things in the case of a merge conflict in the metadata
file. This same idea could be extended to handle file ACLs or other file
metadata if desired.

Signed-off-by: Josh England <jjengla@sandia.gov>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add post-merge hook, related documentation, and tests.Josh England Tue, 11 Sep 2007 16:59:03 +0000 (10:59 -0600)

Add post-merge hook, related documentation, and tests.

The post-merge hook enables one to hook in for `git pull` operations in order
to check and/or change attributes of a work tree from the hook. As an example,
it can be used in combination with a pre-commit hook to save/restore file
ownership and permissions data (or file ACLs) within the repository and
transparently update the working tree after a `git pull` operation.

Signed-off-by: Josh England <jjengla@sandia.gov>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 19 Sep 2007 00:39:25 +0000 (17:39 -0700)

Merge branch 'maint'

* maint:
Fixed update-hook example allow-users format.
Documentation/git-svn: updated design philosophy notes
t/t4014: test "am -3" with mode-only change.
Fix lapsus in builtin-apply.c
git-push: documentation and tests for pushing only branches
git-svnimport: Use separate arguments in the pipe for git-rev-parse

Fixed update-hook example allow-users format.Väinö Järvelä Tue, 18 Sep 2007 12:26:09 +0000 (15:26 +0300)

Fixed update-hook example allow-users format.

The example provided with the update-hook-example does not work on
either bash 2.05b.0(1)-release nor 3.1.17(1)-release. The matcher did
not match the lines that it advertised to match, such as:

refs/heads/bw/ linus
refs/heads/tmp/* *

In POSIX 1003.2 regular expressions, the star (*), is not an wildcard
meaning "match everything", it matches 0 or more matches of the atom
preceding it.

So to match "refs/heads/bw/topic-branch", the matcher should be written
as "refs/heads/bw/.*" to match "refs/heads/bw/" and everything after it.

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

Documentation/git-svn: updated design philosophy notesEric Wong Tue, 18 Sep 2007 23:50:42 +0000 (16:50 -0700)

Documentation/git-svn: updated design philosophy notes

This section has not been updated in a while and
--branches/--tags/--trunk options are commonly used nowadays.

Noticed-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t4014: test "am -3" with mode-only change.Junio C Hamano Tue, 18 Sep 2007 22:19:47 +0000 (15:19 -0700)

t/t4014: test "am -3" with mode-only change.

Earlier commit ece7b74903007cee8d280573647243d46a6f3a95 added a test
for rebase that uses "am -3", but this adds a test to check "am -3"
itself.

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

git-commit.sh: Shell script cleanupDavid Kastrup Mon, 17 Sep 2007 20:56:44 +0000 (22:56 +0200)

git-commit.sh: Shell script cleanup

This moves "shift" out of the argument processing "case". It also
replaces quite a bit of expr calls with ${parameter#word} constructs,
and uses ${parameter:+word} for avoiding conditionals where possible.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

preserve executable bits in zip archivesDmitry Potapov Sun, 16 Sep 2007 17:07:38 +0000 (21:07 +0400)

preserve executable bits in zip archives

Correct `git-archive --format=zip' command to preserve executable bits in
zip archives.

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

Fix lapsus in builtin-apply.cPierre Habouzit Tue, 18 Sep 2007 10:12:58 +0000 (12:12 +0200)

Fix lapsus in builtin-apply.c

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-push: documentation and tests for pushing only... Jeff King Tue, 18 Sep 2007 08:15:34 +0000 (04:15 -0400)

git-push: documentation and tests for pushing only branches

Commit 098e711e caused git-push to match only branches when
considering which refs to push. This patch updates the
documentation accordingly and adds a test for this behavior.

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

git-svnimport: Use separate arguments in the pipe for... Matthias Urlichs Tue, 18 Sep 2007 09:29:09 +0000 (11:29 +0200)

git-svnimport: Use separate arguments in the pipe for git-rev-parse

Some people seem to create SVN branch names with spaces
or other shell metacharacters.

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib/fast-import: add perl version of simple exampleJeff King Tue, 18 Sep 2007 07:26:27 +0000 (03:26 -0400)

contrib/fast-import: add perl version of simple example

This is based on the git-import.sh script, but is a little
more robust and efficient. More importantly, it should
serve as a quick template for interfacing fast-import with
perl scripts.

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

contrib/fast-import: add simple shell exampleNguyen Thai Ngoc Duy Tue, 18 Sep 2007 07:26:01 +0000 (03:26 -0400)

contrib/fast-import: add simple shell example

This example just puts a directory under git control. It is
significantly slower than using the git tools directly, but
hopefully shows a bit how fast-import works.

[jk: added header comments]

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

rev-list --bisect: Bisection "distance" clean up.Christian Couder Mon, 17 Sep 2007 03:28:36 +0000 (05:28 +0200)

rev-list --bisect: Bisection "distance" clean up.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rev-list --bisect: Move some bisection code into best_b... Christian Couder Mon, 17 Sep 2007 03:28:29 +0000 (05:28 +0200)

rev-list --bisect: Move some bisection code into best_bisection.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rev-list --bisect: Move finding bisection into do_find_... Christian Couder Mon, 17 Sep 2007 03:28:20 +0000 (05:28 +0200)

rev-list --bisect: Move finding bisection into do_find_bisection.

This factorises some code and make a big function smaller.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'cr/reset'Junio C Hamano Tue, 18 Sep 2007 07:42:01 +0000 (00:42 -0700)

Merge branch 'cr/reset'

* cr/reset:
Simplify cache API
An additional test for "git-reset -- path"
Make "git reset" a builtin.
Move make_cache_entry() from merge-recursive.c into read-cache.c
Add tests for documented features of "git reset".

Merge branch 'maint'Junio C Hamano Tue, 18 Sep 2007 07:41:43 +0000 (00:41 -0700)

Merge branch 'maint'

* maint:
Document ls-files --with-tree=<tree-ish>
git-commit: partial commit of paths only removed from the index
git-commit: Allow partial commit of file removal.
send-email: make message-id generation a bit more robust
git-gui: Disable native platform text selection in "lists"
git-gui: Paper bag fix "Commit->Revert" format arguments
git-gui: Provide 'uninstall' Makefile target to undo an installation
git-gui: Font chooser to handle a large number of font families
git-gui: Make backporting changes from i18n version easier
git-gui: Don't delete send on Windows as it doesn't exist
git-gui: Trim trailing slashes from untracked submodule names
git-gui: Assume untracked directories are Git submodules
git-gui: handle "deleted symlink" diff marker
git-gui: show unstaged symlinks in diff viewer
git-gui: Avoid use of libdir in Makefile
git-gui: Disable Tk send in all git-gui sessions
git-gui: lib/index.tcl: handle files with % in the filename properly
git-gui: Properly set the state of "Stage/Unstage Hunk" action
git-gui: Fix detaching current branch during checkout
git-gui: Correct starting of git-remote to handle -w option

Document ls-files --with-tree=<tree-ish>Junio C Hamano Fri, 14 Sep 2007 23:59:04 +0000 (16:59 -0700)

Document ls-files --with-tree=<tree-ish>

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

git-commit: partial commit of paths only removed from... Junio C Hamano Fri, 14 Sep 2007 23:53:58 +0000 (16:53 -0700)

git-commit: partial commit of paths only removed from the index

Because a partial commit is meant to be a way to ignore what are
staged in the index, "git rm --cached A && git commit A" should
just record what is in A on the filesystem. The previous patch
made the command sequence to barf, saying that A has not been
added yet. This fixes it.

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

git-commit: Allow partial commit of file removal.Junio C Hamano Wed, 12 Sep 2007 23:04:22 +0000 (16:04 -0700)

git-commit: Allow partial commit of file removal.

When making a partial commit, git-commit uses git-ls-files with
the --error-unmatch option to expand and sanity check the user
supplied path patterns. When any path pattern does not match
with the paths known to the index, it errors out, in order to
catch a common mistake to say "git commit Makefiel cache.h"
and end up with a commit that touches only cache.h (notice the
misspelled "Makefile"). This detection however does not work
well when the path has already been removed from the index.

If you drop a path from the index and try to commit that
partially, i.e.

$ git rm COPYING
$ git commit -m 'Remove COPYING' COPYING

the command complains because git does not know anything about
COPYING anymore.

This introduces a new option --with-tree to git-ls-files and
uses it in git-commit when we build a temporary index to
write a tree object for the partial commit.

When --with-tree=<tree-ish> option is specified, names from the
given tree are added to the set of names the index knows about,
so we can treat COPYING file in the example as known.

Of course, there is no reason to use "git rm" and git-aware
people have long time done:

$ rm COPYING
$ git commit -m 'Remove COPYING' COPYING

which works just fine. But this caused a constant confusion.

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

Merge branch 'jc/grep-c' into maintJunio C Hamano Tue, 18 Sep 2007 06:56:40 +0000 (23:56 -0700)

Merge branch 'jc/grep-c' into maint

* jc/grep-c:
Split grep arguments in a way that does not requires to add /dev/null.

Merge branch 'maint' of git://repo.or.cz/git-gui into... Junio C Hamano Tue, 18 Sep 2007 06:50:17 +0000 (23:50 -0700)

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
git-gui: Disable native platform text selection in "lists"
git-gui: Paper bag fix "Commit->Revert" format arguments
git-gui: Provide 'uninstall' Makefile target to undo an installation
git-gui: Font chooser to handle a large number of font families
git-gui: Make backporting changes from i18n version easier
git-gui: Don't delete send on Windows as it doesn't exist
git-gui: Trim trailing slashes from untracked submodule names
git-gui: Assume untracked directories are Git submodules
git-gui: handle "deleted symlink" diff marker
git-gui: show unstaged symlinks in diff viewer
git-gui: Avoid use of libdir in Makefile
git-gui: Disable Tk send in all git-gui sessions
git-gui: lib/index.tcl: handle files with % in the filename properly
git-gui: Properly set the state of "Stage/Unstage Hunk" action
git-gui: Fix detaching current branch during checkout
git-gui: Correct starting of git-remote to handle -w option

git-gc --auto: run "repack -A -d -l" as necessary.Junio C Hamano Mon, 17 Sep 2007 07:55:13 +0000 (00:55 -0700)

git-gc --auto: run "repack -A -d -l" as necessary.

This teaches "git-gc --auto" to consolidate many packs into one
without losing unreachable objects in them by using "repack -A"
when there are too many packfiles that are not marked with *.keep
in the repository. gc.autopacklimit configuration can be used
to set the maximum number of packs a repository is allowed to
have before this mechanism kicks in.

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

git-gc --auto: restructure the way "repack" command... Junio C Hamano Mon, 17 Sep 2007 07:48:39 +0000 (00:48 -0700)

git-gc --auto: restructure the way "repack" command line is built.

We used to build the command line to run repack outside of
need_to_gc() but with the next patch we would want to tweak the
command line depending on the nature of need.

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

git-gc --auto: protect ourselves from accumulated cruftJunio C Hamano Mon, 17 Sep 2007 07:44:17 +0000 (00:44 -0700)

git-gc --auto: protect ourselves from accumulated cruft

Deciding to run "repack -d -l" when there are too many
loose objects would backfire when there are too many loose
objects that are unreachable, because repacking that way would
never improve the situation. Detect that case by checking the
number of loose objects again after automatic garbage collection
runs, and issue an warning to run "prune" manually.

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

git-gc --auto: add documentation.Junio C Hamano Mon, 17 Sep 2007 07:39:52 +0000 (00:39 -0700)

git-gc --auto: add documentation.

This documents the auto-packing of loose objects performed by
git-gc --auto.

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

git-gc --auto: move threshold check to need_to_gc(... Junio C Hamano Mon, 17 Sep 2007 07:37:06 +0000 (00:37 -0700)

git-gc --auto: move threshold check to need_to_gc() function.

That is where we decide if we are going to run gc
automatically.

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

repack -A -d: use --keep-unreachable when repackingJunio C Hamano Mon, 17 Sep 2007 06:24:07 +0000 (23:24 -0700)

repack -A -d: use --keep-unreachable when repacking

This is a safer variant of "repack -a -d" that does not drop
unreachable objects that are in packs.

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

send-email: make message-id generation a bit more robustJunio C Hamano Tue, 18 Sep 2007 04:18:20 +0000 (21:18 -0700)

send-email: make message-id generation a bit more robust

Earlier code took Unix time and appended a few random digits.
If you are firing off many messages within a second, you could
issue the same id to different messages, which is a no-no. If
you send out 31 messages within a single second, with random
integer taken out of rand(4200), you have about 10% chance of
producing the same message ID.

This fixes the problem by uses a prefix string which is
constant-per-invocation (time and pid), with a serial number for
each message generated by the process appended at the end.

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

pack-objects --keep-unreachableJunio C Hamano Mon, 17 Sep 2007 06:20:07 +0000 (23:20 -0700)

pack-objects --keep-unreachable

This new option is meant to be used in conjunction with the
options "git repack -a -d" usually invokes the underlying
pack-objects with. When this option is given, objects unreachable
from the refs in packs named with --unpacked= option are added
to the resulting pack, in addition to the reachable objects that
are not in packs marked with *.keep files.

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

Export matches_pack_name() and fix its return valueJunio C Hamano Mon, 17 Sep 2007 06:15:19 +0000 (23:15 -0700)

Export matches_pack_name() and fix its return value

The function sounds boolean; make it behave as one, not "0 for
success, non-zero for failure".

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

Merge branch 'maint'Junio C Hamano Mon, 17 Sep 2007 09:21:43 +0000 (02:21 -0700)

Merge branch 'maint'

* maint:
git-apply: fix whitespace stripping
apply --index-info: fall back to current index for mode changes
core-tutorial: minor cleanup
documentation: replace Discussion section by link to user-manual chapter
user-manual: todo updates and cleanup
user-manual: fix introduction to packfiles
user-manual: move packfile and dangling object discussion
user-manual: rewrite object database discussion
user-manual: reorder commit, blob, tree discussion
user-manual: rewrite index discussion
user-manual: create new "low-level git operations" chapter
user-manual: rename "git internals" to "git concepts"
user-manual: move object format details to hacking-git chapter
user-manual: adjust section levels in "git internals"
revision walker: --cherry-pick is a limited operation
git-sh-setup: typofix in comments

git-apply: fix whitespace strippingJ. Bruce Fields Sun, 16 Sep 2007 22:49:00 +0000 (18:49 -0400)

git-apply: fix whitespace stripping

The algorithm isn't right here: it accumulates any set of 8 spaces into
tabs even if they're separated by tabs, so

<four spaces><tab><four spaces><tab>

is converted to

<tab><tab><tab>

when it should be just

<tab><tab>

So teach git-apply that a tab hides any group of less than 8 previous
spaces in a row.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: Disable native platform text selection in... gitgui-0.8.3Shawn O. Pearce Mon, 17 Sep 2007 03:12:19 +0000 (23:12 -0400)

git-gui: Disable native platform text selection in "lists"

Sometimes we use a Tk text widget as though it were a listbox.
This happens typically when we want to show an icon to the left
of the text label or just when a text widget is generally a better
choice then the native listbox widget.

In these cases if we want the user to have control over the selection
we implement our own "in_sel" tag that shows the selected region
and we perform our own selection management in the background
via keybindings and mouse bindings. In such uses we don't want
the user to be able to activate the native platform selection by
dragging their mouse through the text widget. Doing so creates a
very confusing display and the user is left wondering what it may
mean to have two different types of selection in the same widget.

Tk doesn't allow us to delete the "sel" tag that it uses internally
to manage the native selection but it will allow us to make it
invisible by setting the tag to have the same display properties
as unselected text. So long as we don't actually use the "sel"
tag for anything in code its effectively invisible.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

apply --index-info: fall back to current index for... Johannes Schindelin Mon, 17 Sep 2007 00:24:57 +0000 (01:24 +0100)

apply --index-info: fall back to current index for mode changes

"git diff" does not record index lines for pure mode changes (i.e. no
lines changed). Therefore, apply --index-info would call out a bogus
error.

Instead, fall back to reading the info from the current index.

Incidentally, this fixes an error where git-rebase would not rebase a
commit including a pure mode change, and changes requiring a threeway
merge.

Noticed and later tested by Chris Shoemaker.

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

Merge branch 'maint' of git://linux-nfs.org/~bfields... Junio C Hamano Sun, 16 Sep 2007 06:18:05 +0000 (23:18 -0700)

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
core-tutorial: minor cleanup
documentation: replace Discussion section by link to user-manual chapter
user-manual: todo updates and cleanup
user-manual: fix introduction to packfiles
user-manual: move packfile and dangling object discussion
user-manual: rewrite object database discussion
user-manual: reorder commit, blob, tree discussion
user-manual: rewrite index discussion
user-manual: create new "low-level git operations" chapter
user-manual: rename "git internals" to "git concepts"
user-manual: move object format details to hacking-git chapter
user-manual: adjust section levels in "git internals"

core-tutorial: minor cleanupJ. Bruce Fields Mon, 3 Sep 2007 14:34:27 +0000 (10:34 -0400)

core-tutorial: minor cleanup

Revise the introduction for concision, add pointers to the tutorial and
user manual as appropriate, delete cvsimport note from the end, as that
work's been done elsewhere already.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

documentation: replace Discussion section by link to... J. Bruce Fields Mon, 3 Sep 2007 04:01:19 +0000 (00:01 -0400)

documentation: replace Discussion section by link to user-manual chapter

The "Discussion" section has a lot of useful information, but is a
little wordy, especially for an already-long man page, and is designed
for an audience more of potential git hackers than users, which probably
doesn't make as much sense as git matures. Also, I (perhaps foolishly)
forked a version in the user manual, which has been significantly
rewritten in an attempt to address some of the above problems.

So, remove this section and replace it by a (very terse) summary of the
original material--my attempt at the World's Shortest Git Overview--and
a reference to the appropriate chapter of the user manual. It's
unfortunate to remove something that's been in this place for a long
time, as some people may still depend on finding it there. But I think
we'll want to do this some day anyway.

Cc: Andreas Ericsson <ae@op5.se>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: todo updates and cleanupJ. Bruce Fields Mon, 3 Sep 2007 03:28:49 +0000 (23:28 -0400)

user-manual: todo updates and cleanup

Format a couple lists. Reminder that we may want to add submodule
documentation some day.

user-manual: fix introduction to packfilesJ. Bruce Fields Sun, 9 Sep 2007 02:27:18 +0000 (22:27 -0400)

user-manual: fix introduction to packfiles

Actually I don't think we've previously mentioned .git/objects, so we
need a different introduction here.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: move packfile and dangling object discussionJ. Bruce Fields Sun, 9 Sep 2007 02:13:53 +0000 (22:13 -0400)

user-manual: move packfile and dangling object discussion

The discussions of packfiles and dangling objects both belong in the
object database section.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: rewrite object database discussionJ. Bruce Fields Sun, 10 Jun 2007 19:15:08 +0000 (15:15 -0400)

user-manual: rewrite object database discussion

Rewrite the introduction. Rewrite each section completely to make them
work in the new order, to add some examples, and to move plumbing
commands (like git-commit-tree) to the following chapter.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: reorder commit, blob, tree discussionJ. Bruce Fields Sat, 1 Sep 2007 03:26:38 +0000 (23:26 -0400)

user-manual: reorder commit, blob, tree discussion

The bottom-up blog, tree, commit order makes sense unless you want to
give explicit examples--it's easier to discover objects to examine if
you go in the other order....,

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: rewrite index discussionJ. Bruce Fields Mon, 3 Sep 2007 16:59:55 +0000 (12:59 -0400)

user-manual: rewrite index discussion

Add an example using git-ls-files, standardize on the new "index"
terminology (as opposed to "cache"), attempt to clarify discussion and
make it a little shorter, avoid some unnecessary jargon ("write-back
cache").

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: create new "low-level git operations"... J. Bruce Fields Mon, 3 Sep 2007 15:27:56 +0000 (11:27 -0400)

user-manual: create new "low-level git operations" chapter

The low-level index operations aren't as important to regular users as
the rest of this "git concepts" chapter; so move it into a separate
chapter, and do some minor cleanup.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: rename "git internals" to "git concepts"J. Bruce Fields Fri, 31 Aug 2007 03:10:05 +0000 (23:10 -0400)

user-manual: rename "git internals" to "git concepts"

"git internals" sounds like something only git developers must know
about, but this stuff should be of wider interest. Rename the chapter
and give it a slightly friendlier introduction.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: move object format details to hacking... J. Bruce Fields Fri, 31 Aug 2007 03:07:05 +0000 (23:07 -0400)

user-manual: move object format details to hacking-git chapter

Most of this is probably only of interest to git developers.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: adjust section levels in "git internals"J. Bruce Fields Fri, 31 Aug 2007 02:49:33 +0000 (22:49 -0400)

user-manual: adjust section levels in "git internals"

The descriptions of the various object types should all be a subsection
of the "Object Database" section.

I cribbed most of this chapter from the README (now core-intro.txt and
git(7)), because there's stuff in there people need to know and I was
too lazy to rewrite it. The audience isn't quite right, though--the
chapter is a mixture of user- and developer- level documentation that
isn't as appropriate now as it was originally.

So, reserve this chapter for stuff users need to know, and move the
source code introduction into a new "git hacking" chapter where we'll
also move any hacker-only technical details.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

revision walker: --cherry-pick is a limited operationJohannes Schindelin Sat, 15 Sep 2007 17:39:52 +0000 (18:39 +0100)

revision walker: --cherry-pick is a limited operation

We used to rely on the fact that cherry-pick would trigger the code path
to set limited = 1 in handle_commit(), when an uninteresting commit was
encountered.

However, when cherry picking between two independent branches, i.e. when
there are no merge bases, and there is only linear development (which can
happen when you cvsimport a fork of a project), no uninteresting commit
will be encountered.

So set limited = 1 when --cherry-pick was asked for.

Noticed by Martin Bähr.

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

git-sh-setup: typofix in commentsJunio C Hamano Sat, 15 Sep 2007 23:32:23 +0000 (16:32 -0700)

git-sh-setup: typofix in comments

Noticed by Anupam Srivastava.

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

Merge branch 'js/remote'Junio C Hamano Sat, 15 Sep 2007 05:38:06 +0000 (22:38 -0700)

Merge branch 'js/remote'

* js/remote:
Teach "git remote" a mirror mode

Merge branch 'js/tag'Junio C Hamano Sat, 15 Sep 2007 05:37:55 +0000 (22:37 -0700)

Merge branch 'js/tag'

* js/tag:
verify-tag: also grok CR/LFs in the tag signature

Merge branch 'lh/svn-first-parent'Junio C Hamano Sat, 15 Sep 2007 05:37:43 +0000 (22:37 -0700)

Merge branch 'lh/svn-first-parent'

* lh/svn-first-parent:
git-svn: always use --first-parent
git-svn: add support for --first-parent

Merge branch 'np/delta'Junio C Hamano Sat, 15 Sep 2007 05:33:28 +0000 (22:33 -0700)

Merge branch 'np/delta'

* np/delta:
builtin-pack-objects.c: avoid bogus gcc warnings
threaded delta search: proper locking for cache accounting
threaded delta search: add pack.threads config variable
fix threaded delta search locking
threaded delta search: specify number of threads at run time
threaded delta search: better chunck split point
threaded delta search: refine work allocation
basic threaded delta search
rearrange delta search progress reporting
localize window memory usage accounting
straighten the list of objects to deltify

builtin-pack-objects.c: avoid bogus gcc warningsJunio C Hamano Sat, 15 Sep 2007 05:30:20 +0000 (22:30 -0700)

builtin-pack-objects.c: avoid bogus gcc warnings

These empty statement marcos can solicit bogus "statement with no effect"
warnings; squelch them.

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

Merge branch 'jc/pack'Junio C Hamano Sat, 15 Sep 2007 01:33:45 +0000 (18:33 -0700)

Merge branch 'jc/pack'

* jc/pack:
Keep last used delta base in the delta window

Merge branch 'dk/diff-delta'Junio C Hamano Sat, 15 Sep 2007 01:33:15 +0000 (18:33 -0700)

Merge branch 'dk/diff-delta'

* dk/diff-delta:
diff-delta.c: Rationalize culling of hash buckets
diff-delta.c: pack the index structure

Merge branch 'jc/partial-remove'Junio C Hamano Sat, 15 Sep 2007 01:23:01 +0000 (18:23 -0700)

Merge branch 'jc/partial-remove'

* jc/partial-remove:
Document ls-files --with-tree=<tree-ish>
git-commit: partial commit of paths only removed from the index
git-commit: Allow partial commit of file removal.

Document ls-files --with-tree=<tree-ish>Junio C Hamano Fri, 14 Sep 2007 23:59:04 +0000 (16:59 -0700)

Document ls-files --with-tree=<tree-ish>

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

git-commit: partial commit of paths only removed from... Junio C Hamano Fri, 14 Sep 2007 23:53:58 +0000 (16:53 -0700)

git-commit: partial commit of paths only removed from the index

Because a partial commit is meant to be a way to ignore what are
staged in the index, "git rm --cached A && git commit A" should
just record what is in A on the filesystem. The previous patch
made the command sequence to barf, saying that A has not been
added yet. This fixes it.

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

Merge branch 'jc/grep-c'Junio C Hamano Fri, 14 Sep 2007 22:17:07 +0000 (15:17 -0700)

Merge branch 'jc/grep-c'

* jc/grep-c:
Split grep arguments in a way that does not requires to add /dev/null.
Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
Add test to check recent fix to "git add -u"
Documentation/git-archive.txt: a couple of clarifications.
Fix the rename detection limit checking
diff --no-index: do not forget to run diff_setup_done()

Split grep arguments in a way that does not requires... Junio C Hamano Fri, 14 Sep 2007 07:31:00 +0000 (00:31 -0700)

Split grep arguments in a way that does not requires to add /dev/null.

In order to (almost) always show the name of the file without
relying on "-H" option of GNU grep, we used to add /dev/null to
the argument list unless we are doing -l or -L. This caused
"/dev/null:0" to show up when -c is given in the output.

It is not enough to add -c to the set of options we do not pass
/dev/null for. When we have too many files, we invoke grep
multiple times and we need to avoid giving a widow filename to
the last invocation -- otherwise we will not see the name.

This keeps two filenames when the argv[] buffer is about to
overflow and we have not finished iterating over the index, so
that the last round will always have at least two paths to work
with (and not require /dev/null).

An obvious and the only exception is when there is only 1 file
that is given to the underlying grep, and in that case we avoid
passing /dev/null and let the external "grep -c" report only the
number of matches.

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

Documentation/git-config.txt: AsciiDoc tweak to avoid... Junio C Hamano Fri, 14 Sep 2007 21:51:08 +0000 (14:51 -0700)

Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot

Bram Schoenmakers noticed that git-config document was formatted
incorrectly. Depending on the version of AsciiDoc and docbook
toolchain, it is sometimes taken as a numbered example by AsciiDoc,
some other times passed intact to roff format to confuse "man".

Since we refer to the repository metadata directory as $GIT_DIR
elsewhere, work it around by using that symbolic name.

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

Add test to check recent fix to "git add -u"Benoit Sigoure Fri, 14 Sep 2007 08:29:04 +0000 (10:29 +0200)

Add test to check recent fix to "git add -u"

An earlier commit fixed type-change case in "git add -u".
This adds a test to make sure we do not introduce regression.

At the same time, it fixes a stupid typo in the error message.

Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-archive.txt: a couple of clarifications.Jari Aalto Fri, 14 Sep 2007 18:38:02 +0000 (21:38 +0300)

Documentation/git-archive.txt: a couple of clarifications.

The description of the option gave impression that there
were several formats available by using three dots. There are
no other formats than tar and gzip currently supported.

Clarify that the archive goes to the standard output.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix the rename detection limit checkingLinus Torvalds Fri, 14 Sep 2007 17:39:48 +0000 (10:39 -0700)

Fix the rename detection limit checking

This adds more proper rename detection limits. Instead of just checking
the limit against the number of potential rename destinations, we verify
that the rename matrix (which is what really matters) doesn't grow
ridiculously large, and we also make sure that we don't overflow when
doing the matrix size calculation.

This also changes the default limits from unlimited, to a rename matrix
that is limited to 100 entries on a side. You can raise it with the config
entry, or by using the "-l<n>" command line flag, but at least the default
is now a sane number that avoids spending lots of time (and memory) in
situations that likely don't merit it.

The choice of default value is of course very debatable. Limiting the
rename matrix to a 100x100 size will mean that even if you have just one
obvious rename, but you also create (or delete) 10,000 files, the rename
matrix will be so big that we disable the heuristics. Sounds reasonable to
me, but let's see if people hit this (and, perhaps more importantly,
actually *care*) in real life.

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