gitweb.git
Merge branch 'lt/diffgen' into nextJunio C Hamano Sun, 26 Mar 2006 01:44:01 +0000 (17:44 -0800)

Merge branch 'lt/diffgen' into next

* lt/diffgen:
built-in diff: minimum tweaks
builtin-diff: \No newline at end of file.
Use a *real* built-in diff generator

Merge branch 'rs/tar-tree' into nextJunio C Hamano Sun, 26 Mar 2006 01:43:22 +0000 (17:43 -0800)

Merge branch 'rs/tar-tree' into next

* rs/tar-tree:
tar-tree: Use the prefix field of a tar header
tar-tree: Remove obsolete code
tar-tree: Use write_entry() to write the archive contents
tar-tree: Introduce write_entry()
tar-tree: Use SHA1 of root tree for the basedir
git-apply: safety fixes
Removed bogus "<snap>" identifier.
Clarify and expand some hook documentation.
commit-tree: check return value from write_sha1_file()
send-email: Identify author at the top when sending e-mail
Format tweaks for asciidoc.

built-in diff: minimum tweaksJunio C Hamano Sat, 25 Mar 2006 20:16:17 +0000 (12:16 -0800)

built-in diff: minimum tweaks

This fixes up a couple of minor issues with the real built-in
diff to be more usable:

- Omit ---/+++ header unless we emit diff output;

- Detect and punt binary diff like GNU does;

- Honor GIT_DIFF_OPTS minimally (only -u<number> and
--unified=<number> are currently supported);

- Omit line count of 1 from "@@ -l,k +m,n @@" hunk header
(i.e. when k == 1 or n == 1)

- Adjust testsuite for the lack of -p support.

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

builtin-diff: \No newline at end of file.Linus Torvalds Sat, 25 Mar 2006 15:56:03 +0000 (07:56 -0800)

builtin-diff: \No newline at end of file.

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

Use a *real* built-in diff generatorLinus Torvalds Sat, 25 Mar 2006 04:13:22 +0000 (20:13 -0800)

Use a *real* built-in diff generator

This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".

This has several huge advantages, for example:

Before:

[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null

real 0m24.818s
user 0m13.332s
sys 0m8.664s

After:

[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null

real 0m4.563s
user 0m2.944s
sys 0m1.580s

and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).

Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).

NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.

But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.

Now, in the interest of full disclosure, I should also point out a few
downsides:

- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.

- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.

- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.

That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.

Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.

That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.

Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do

mmfile_t mf;

buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..

which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).

[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]

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

tar-tree: Use the prefix field of a tar headerRene Scharfe Sat, 25 Mar 2006 22:21:07 +0000 (23:21 +0100)

tar-tree: Use the prefix field of a tar header

... to store parts of the path, if possible. This allows us to avoid
writing extended headers in certain cases (long pathes can only be
split at '/' chars).

Also adds a file to the test repo with a 100 chars long directory name.
Even old versions of tar that don't understand POSIX extended headers
should be able to handle this testcase.

Btw.: The longest path in the kernel tree currently has 70 chars.
Together with a 30 chars long prefix this would already cross the
field limit of 100 chars.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

tar-tree: Remove obsolete codeRene Scharfe Sat, 25 Mar 2006 22:21:05 +0000 (23:21 +0100)

tar-tree: Remove obsolete code

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

tar-tree: Use write_entry() to write the archive contentsRene Scharfe Sat, 25 Mar 2006 22:21:04 +0000 (23:21 +0100)

tar-tree: Use write_entry() to write the archive contents

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

tar-tree: Introduce write_entry()Rene Scharfe Sat, 25 Mar 2006 22:21:03 +0000 (23:21 +0100)

tar-tree: Introduce write_entry()

... and use it initially to write global extended header records.
Improvements compared to the old write_header():

- Uses a struct ustar_header instead of hardcoded offsets.
- Takes one struct strbuf as path argument instead of a (basedir,
prefix, name) tuple.
- Not only writes the tar header, but also the contents of the
file, if any.
- Does not write directly into the ring buffer. This allows the
code to be layed out more naturally, because there is no more
ordering constraint. Before we had to first finish writing the
extended header, now we can construct the extended and normal
headers in parallel.
- The typeflag parameter has been replaced by (reasonable) magic
values. path == NULL indicates an extended header, additionally
sha1 == NULL means it is a global extended header.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

tar-tree: Use SHA1 of root tree for the basedirRene Scharfe Sat, 25 Mar 2006 22:21:02 +0000 (23:21 +0100)

tar-tree: Use SHA1 of root tree for the basedir

... instead of the made-up "0".

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-apply: safety fixesLinus Torvalds Sat, 25 Mar 2006 21:28:28 +0000 (13:28 -0800)

git-apply: safety fixes

This was triggered by me testing the "@@" numbering shorthand by GNU
patch, which not only showed that git-apply thought it meant the number
was duplicated (when it means that the second number is 1), but my tests
showed than when git-apply mis-understood the number, it would then not
raise an alarm about it if the patch ended early.

Now, this doesn't actually _matter_, since with a three-line context, the
only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in
which case git-apply got it right), but the fact that git-apply would also
silently accept truncated patches was a missed opportunity for additional
sanity-checking.

So make git-apply refuse to look at a patch fragment that ends early.

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

Removed bogus "<snap>" identifier.Jon Loeliger Sat, 25 Mar 2006 03:27:13 +0000 (21:27 -0600)

Removed bogus "<snap>" identifier.

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

Clarify and expand some hook documentation.Jon Loeliger Sat, 25 Mar 2006 03:21:07 +0000 (21:21 -0600)

Clarify and expand some hook documentation.

Clarify update and post-update hooks.
Made a few references to the hooks documentation.

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

commit-tree: check return value from write_sha1_file()Junio C Hamano Sat, 25 Mar 2006 06:23:25 +0000 (22:23 -0800)

commit-tree: check return value from write_sha1_file()

... found by Matthias Kestenholz.

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

Merge branch 'jc/name' into nextJunio C Hamano Fri, 24 Mar 2006 07:52:42 +0000 (23:52 -0800)

Merge branch 'jc/name' into next

* jc/name:
sha1_name: make core.warnambiguousrefs the default.
sha1_name: warning ambiguous refs.

Merge branch 'jc/cvsimport'Junio C Hamano Fri, 24 Mar 2006 07:49:07 +0000 (23:49 -0800)

Merge branch 'jc/cvsimport'

* jc/cvsimport:
cvsimport: fix reading from rev-parse
cvsimport: honor -i and non -i upon subsequent imports

Merge branch 'jc/pull'Junio C Hamano Fri, 24 Mar 2006 07:47:32 +0000 (23:47 -0800)

Merge branch 'jc/pull'

* jc/pull:
git-pull: reword "impossible to fast-forward" message.
git-pull: further safety while on tracking branch.

Merge branch 'jc/fetch'Junio C Hamano Fri, 24 Mar 2006 07:46:06 +0000 (23:46 -0800)

Merge branch 'jc/fetch'

* jc/fetch:
fetch: exit non-zero when fast-forward check fails.

send-email: Identify author at the top when sending... Junio C Hamano Fri, 24 Mar 2006 07:43:52 +0000 (23:43 -0800)

send-email: Identify author at the top when sending e-mail

git-send-email did not check if the sender is the same as the
patch author. Follow the "From: at the beginning" convention to
propagate the patch author correctly.

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

sha1_name: make core.warnambiguousrefs the default.Junio C Hamano Fri, 24 Mar 2006 07:42:40 +0000 (23:42 -0800)

sha1_name: make core.warnambiguousrefs the default.

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

sha1_name: warning ambiguous refs.Junio C Hamano Fri, 24 Mar 2006 07:41:18 +0000 (23:41 -0800)

sha1_name: warning ambiguous refs.

This makes sure that many commands that take refs on the command
line to honor core.warnambiguousrefs configuration. Earlier,
the commands affected by this patch did not read the
configuration file.

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

Format tweaks for asciidoc.Francis Daly Wed, 22 Mar 2006 09:53:57 +0000 (09:53 +0000)

Format tweaks for asciidoc.

Some documentation "options" were followed by independent preformatted
paragraphs. Now they are associated plain text paragraphs. The
difference is clear in the generated html.

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

Merge branch 'jc/pull' into nextJunio C Hamano Wed, 22 Mar 2006 09:57:24 +0000 (01:57 -0800)

Merge branch 'jc/pull' into next

* jc/pull:
git-pull: reword "impossible to fast-forward" message.
git-pull: further safety while on tracking branch.

git-pull: reword "impossible to fast-forward" message.Junio C Hamano Wed, 22 Mar 2006 09:57:11 +0000 (01:57 -0800)

git-pull: reword "impossible to fast-forward" message.

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

git-pull: further safety while on tracking branch.Junio C Hamano Wed, 22 Mar 2006 09:09:43 +0000 (01:09 -0800)

git-pull: further safety while on tracking branch.

Running 'git pull' while on the tracking branch has a built-in
safety valve to fast-forward the index and working tree to match
the branch head, but it errs on the safe side too cautiously.

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

Merge branch 'jc/revlist' into nextJunio C Hamano Wed, 22 Mar 2006 08:52:41 +0000 (00:52 -0800)

Merge branch 'jc/revlist' into next

* jc/revlist:
rev-list --timestamp
git-apply: do not barf when updating an originally empty file.
http-push.c: squelch C90 warnings.
fix field width/precision warnings in blame.c

Merge branch 'jc/clone' into nextJunio C Hamano Wed, 22 Mar 2006 08:52:36 +0000 (00:52 -0800)

Merge branch 'jc/clone' into next

* jc/clone:
git-clone: typofix.

git-clone: typofix.Junio C Hamano Wed, 22 Mar 2006 08:23:16 +0000 (00:23 -0800)

git-clone: typofix.

The traditional one created refs/origin by mistake, not
refs/heads/origin. Also it mistakenly failed to prevent
$origin from being listed twice in remotes/origin file.

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

rev-list --timestampJunio C Hamano Wed, 22 Mar 2006 08:22:00 +0000 (00:22 -0800)

rev-list --timestamp

This prefixes the raw commit timestamp to the output.

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

git-apply: do not barf when updating an originally... Junio C Hamano Wed, 22 Mar 2006 08:21:07 +0000 (00:21 -0800)

git-apply: do not barf when updating an originally empty file.

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

http-push.c: squelch C90 warnings.Junio C Hamano Tue, 21 Mar 2006 23:49:05 +0000 (15:49 -0800)

http-push.c: squelch C90 warnings.

If you write code after declarations in a block, gcc scolds you
with "warning: ISO C90 forbids mixed declarations and code".

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

fix field width/precision warnings in blame.cLuck, Tony Tue, 21 Mar 2006 23:28:06 +0000 (15:28 -0800)

fix field width/precision warnings in blame.c

Using "size_t" values for printf field width/precision upsets gcc, it
wants to see an "int".

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/clone' into nextJunio C Hamano Tue, 21 Mar 2006 10:04:50 +0000 (02:04 -0800)

Merge branch 'jc/clone' into next

* jc/clone:
clone: record the remote primary branch with remotes/$origin/HEAD

Merge branch 'jc/name' into nextJunio C Hamano Tue, 21 Mar 2006 10:04:46 +0000 (02:04 -0800)

Merge branch 'jc/name' into next

* jc/name:
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD

clone: record the remote primary branch with remotes... Junio C Hamano Tue, 21 Mar 2006 09:58:26 +0000 (01:58 -0800)

clone: record the remote primary branch with remotes/$origin/HEAD

This matches c51d13692d4e451c755dd7da3521c5db395df192 commit to
record the primary branch of the remote with a symbolic ref
remotes/$origin/HEAD. The user can later change it to point at
different branch to change the meaning of "$origin" shorthand.

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

get_sha1_basic(): try refs/... and finally refs/remotes... Junio C Hamano Tue, 21 Mar 2006 09:42:04 +0000 (01:42 -0800)

get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD

This implements the suggestion by Jeff King to use
refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean
the primary branch head of a tracked remote. clone needs to be
told about this convention as well.

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

Merge branch 'jc/name' into nextJunio C Hamano Tue, 21 Mar 2006 08:15:21 +0000 (00:15 -0800)

Merge branch 'jc/name' into next

* jc/name:
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
contrib/git-svn: allow rebuild to work on non-linear remote heads
http-push: don't assume char is signed
http-push: add support for deleting remote branches
Be verbose when !initial commit
Fix multi-paragraph list items in OPTIONS section
http-fetch: nicer warning for a server with unreliable 404 status

Merge branch 'jc/clone' into nextJunio C Hamano Tue, 21 Mar 2006 08:15:15 +0000 (00:15 -0800)

Merge branch 'jc/clone' into next

* jc/clone:
revamp git-clone (take #2).

revamp git-clone (take #2).Junio C Hamano Tue, 21 Mar 2006 08:14:13 +0000 (00:14 -0800)

revamp git-clone (take #2).

This builds on top of the previous one.

* --use-separate-remote uses .git/refs/remotes/$origin/
directory to keep track of the upstream branches.

* The $origin above defaults to "origin" as usual, but the
existing "-o $origin" option can be used to override it.

I am not yet convinced if we should make "$origin" the synonym to
"refs/remotes/$origin/$name" where $name is the primary branch
name of $origin upstream, nor if so how we should decide which
upstream branch is the primary one, but that is more or less
orthogonal to what the clone does here.

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

core.warnambiguousrefs: warns when "name" is used and... Junio C Hamano Tue, 21 Mar 2006 02:45:47 +0000 (18:45 -0800)

core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.

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

contrib/git-svn: allow rebuild to work on non-linear... Eric Wong Tue, 21 Mar 2006 04:51:16 +0000 (20:51 -0800)

contrib/git-svn: allow rebuild to work on non-linear remote heads

Because committing back to an SVN repository from different
machines can result in different lineages, two different
repositories running git-svn can result in different commit
SHA1s (but of the same tree). Sometimes trees that are tracked
independently are merged together (usually via children),
resulting in non-unique git-svn-id: lines in rev-list.

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

http-push: don't assume char is signedNick Hengeveld Mon, 20 Mar 2006 19:50:51 +0000 (11:50 -0800)

http-push: don't assume char is signed

Declare remote_dir_exists[] as signed char to be sure that values of -1
are valid.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

http-push: add support for deleting remote branchesNick Hengeveld Mon, 20 Mar 2006 18:31:06 +0000 (10:31 -0800)

http-push: add support for deleting remote branches

Processes new command-line arguments -d and -D to remove a remote branch
if the following conditions are met:
- one branch name is present on the command line
- the specified branch name matches exactly one remote branch name
- the remote HEAD is a symref
- the specified branch is not the remote HEAD
- the remote HEAD resolves to an object that exists locally (-d only)
- the specified branch resolves to an object that exists locally (-d only)
- the specified branch is an ancestor of the remote HEAD (-d only)

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Be verbose when !initial commitYasushi SHOJI Mon, 20 Mar 2006 13:11:12 +0000 (22:11 +0900)

Be verbose when !initial commit

verbose option in git-commit.sh lead us to run git-diff-index, which
needs a commit-ish we are making diff against. When we are commiting
the fist set, we obviously don't have any commit-ish in the repo. So
we just skip the git-diff-index run.

It might be possible to produce diff against empty but do we need
that?

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix multi-paragraph list items in OPTIONS sectionFrancis Daly Mon, 20 Mar 2006 10:41:18 +0000 (10:41 +0000)

Fix multi-paragraph list items in OPTIONS section

This patch makes the html docs right, makes the asciidoc docs a bit odd
but consistent with what is there already, and makes the manpages look
OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.

For the manpages, current is like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT

With this patch, docbook-xsl v1.68 looks like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT author and

while docbook-xsl v1.69 becomes

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT author and

The extra indentation is to keep the v1.69 manpage looking sane.

http-fetch: nicer warning for a server with unreliable... Junio C Hamano Mon, 20 Mar 2006 22:07:59 +0000 (14:07 -0800)

http-fetch: nicer warning for a server with unreliable 404 status

When a repository otherwise properly prepared is served by a
dumb HTTP server that sends "No such page" output with 200
status for human consumption to a request for a page that does
not exist, the users will get an alarming "File X corrupt" error
message. Hint that they might be dealing with such a server at
the end and suggest running fsck-objects to check if the result
is OK (the pack-fallback code does the right thing in this case
so unless a loose object file was actually corrupt the result
should check OK).

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

Merge branch 'jc/merge' into nextJunio C Hamano Mon, 20 Mar 2006 08:51:07 +0000 (00:51 -0800)

Merge branch 'jc/merge' into next

* jc/merge:
git-merge knows some strategies want to skip trivial merges
generate-cmdlist: style cleanups.
Add missing semicolon to sed command.
unpack_delta_entry(): reduce memory footprint.
git.el: Added a function to diff against the other heads in a merge.
git.el: Get the default user name and email from the repository config.
git.el: More robust handling of subprocess errors when returning strings.

Merge branch 'jc/clone' into nextJunio C Hamano Mon, 20 Mar 2006 08:50:58 +0000 (00:50 -0800)

Merge branch 'jc/clone' into next

* jc/clone:
revamp git-clone.

git-merge knows some strategies want to skip trivial... Junio C Hamano Sat, 18 Mar 2006 22:50:53 +0000 (14:50 -0800)

git-merge knows some strategies want to skip trivial merges

Most notably "ours". Also this makes sure we do not record
duplicated parents on the parent list of the resulting commit.

This is based on Mark Wooding's work, but does not change the UI
nor introduce new flags.

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

revamp git-clone.Junio C Hamano Mon, 20 Mar 2006 08:21:10 +0000 (00:21 -0800)

revamp git-clone.

This does two things.

* A new flag --reference can be used to name a local repository
that is to be used as an alternate. This is in response to
an inquiry by James Cloos in the message on the list
<m3r74ykue7.fsf@lugabout.cloos.reno.nv.us>.

* A new flag --use-separate-remote stops contaminating local
branch namespace by upstream branch names. The upstream
branch heads are copied in .git/refs/remotes/ instead of
.git/refs/heads/ and .git/remotes/origin file is set up to
reflect this as well. It requires to have fetch/pull update
to understand .git/refs/remotes by Eric Wong to further
update the repository cloned this way.

For the former change, git-fetch-pack is taught a new flag --all
to fetch from all the remote heads. Nobody uses the git-clone-pack
with this change, so we could deprecate the command, but removal
of the command will be left to a separate round.

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

generate-cmdlist: style cleanups.Junio C Hamano Mon, 20 Mar 2006 07:54:45 +0000 (23:54 -0800)

generate-cmdlist: style cleanups.

Instead of giving multiple commands concatenated with semicolon
to sed, write them on separate lines.

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

Add missing semicolon to sed command.Shawn Pearce Mon, 20 Mar 2006 00:18:08 +0000 (19:18 -0500)

Add missing semicolon to sed command.

generate-cmdlist.sh is giving errors messages from sed on Mac OS
10.4 due to a missing semicolon.

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

unpack_delta_entry(): reduce memory footprint.Junio C Hamano Sun, 19 Mar 2006 21:43:42 +0000 (13:43 -0800)

unpack_delta_entry(): reduce memory footprint.

Currently we unpack the delta data from the pack and then unpack
the base object to apply that delta data to it. When getting an
object that is deeply deltified, we can reduce memory footprint
by unpacking the base object first and then unpacking the delta
data, because we will need to keep at most one delta data in
memory that way.

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

git.el: Added a function to diff against the other... Alexandre Julliard Sun, 19 Mar 2006 09:06:10 +0000 (10:06 +0100)

git.el: Added a function to diff against the other heads in a merge.

git-diff-file-merge-head generates a diff against the first merge
head, or with a prefix argument against the nth head. Bound to `d h'
by default.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.el: Get the default user name and email from the... Alexandre Julliard Sun, 19 Mar 2006 09:05:48 +0000 (10:05 +0100)

git.el: Get the default user name and email from the repository config.

If user name or email are not set explicitly, get them from the
user.name and user.email configuration values before falling back to
the Emacs defaults.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git.el: More robust handling of subprocess errors when... Alexandre Julliard Sun, 19 Mar 2006 09:05:22 +0000 (10:05 +0100)

git.el: More robust handling of subprocess errors when returning strings.

Make sure that functions that call a git process and return a string
always return nil when the subprocess failed.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Sat, 18 Mar 2006 22:58:20 +0000 (14:58 -0800)

Merge branch 'master' into next

* master:
Makefile: Add TAGS and tags targets
ls-files: Don't require exclude files to end with a newline.

Makefile: Add TAGS and tags targetsFredrik Kuivinen Sat, 18 Mar 2006 10:07:12 +0000 (11:07 +0100)

Makefile: Add TAGS and tags targets

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

ls-files: Don't require exclude files to end with a... Alexandre Julliard Sat, 18 Mar 2006 10:27:45 +0000 (11:27 +0100)

ls-files: Don't require exclude files to end with a newline.

Without this patch, the last line of an exclude file is silently
ignored if it doesn't end with a newline.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'master' into nextJunio C Hamano Sat, 18 Mar 2006 10:08:10 +0000 (02:08 -0800)

Merge branch 'master' into next

* master:
git-pull: run repo-config with dash form.

git-pull: run repo-config with dash form.Junio C Hamano Sat, 18 Mar 2006 10:07:59 +0000 (02:07 -0800)

git-pull: run repo-config with dash form.

... as discussed on the list for consistency.

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

Merge branch 'jc/cvsimport' into nextJunio C Hamano Sat, 18 Mar 2006 10:05:22 +0000 (02:05 -0800)

Merge branch 'jc/cvsimport' into next

* jc/cvsimport:
cvsimport: fix reading from rev-parse

cvsimport: fix reading from rev-parseJunio C Hamano Sat, 18 Mar 2006 10:05:02 +0000 (02:05 -0800)

cvsimport: fix reading from rev-parse

The updated code reads the tip of the current branch before and
after the import runs, but forgot to chomp what we read from the
command. The read-tree command did not them with the trailing
LF.

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

Merge branch 'jc/empty'Junio C Hamano Sat, 18 Mar 2006 08:43:47 +0000 (00:43 -0800)

Merge branch 'jc/empty'

* jc/empty:
revision traversal: --remove-empty fix (take #2).
revision traversal: --remove-empty fix.

Conflicts:

revision.c (adjust for the updates by Fredrik)

Merge branch 'master' into nextJunio C Hamano Sat, 18 Mar 2006 04:43:15 +0000 (20:43 -0800)

Merge branch 'master' into next

* master:
3% tighter packs for free
Rewrite synopsis to clarify the two primary uses of git-checkout.
Fix minor typo.
Reference git-commit-tree for env vars.
Clarify git-rebase example commands.
Document the default source of template files.
Call out the two different uses of git-branch and fix a typo.
Add git-show reference

3% tighter packs for freeNicolas Pitre Sat, 18 Mar 2006 03:45:07 +0000 (22:45 -0500)

3% tighter packs for free

This patch makes for 3.4% smaller pack with the git repository, and
a bit more than 3% smaller pack with the kernel repository.

And so with _no_ measurable CPU difference.

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

Rewrite synopsis to clarify the two primary uses of... Jon Loeliger Sat, 18 Mar 2006 00:26:01 +0000 (18:26 -0600)

Rewrite synopsis to clarify the two primary uses of git-checkout.

Fix a few typo/grammar problems.

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

Fix minor typo.Jon Loeliger Sat, 18 Mar 2006 00:25:46 +0000 (18:25 -0600)

Fix minor typo.

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

Reference git-commit-tree for env vars.Jon Loeliger Sat, 18 Mar 2006 00:25:09 +0000 (18:25 -0600)

Reference git-commit-tree for env vars.

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

Clarify git-rebase example commands.Jon Loeliger Sat, 18 Mar 2006 00:25:30 +0000 (18:25 -0600)

Clarify git-rebase example commands.

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

Document the default source of template files.Jon Loeliger Sat, 18 Mar 2006 00:24:49 +0000 (18:24 -0600)

Document the default source of template files.

Also explain a bit more about how the template option works.

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

Call out the two different uses of git-branch and fix... Jon Loeliger Sat, 18 Mar 2006 00:24:37 +0000 (18:24 -0600)

Call out the two different uses of git-branch and fix a typo.

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

Add git-show referenceJon Loeliger Sat, 18 Mar 2006 00:21:39 +0000 (18:21 -0600)

Add git-show reference

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

Merge branch 'jc/cvsimport' into nextJunio C Hamano Fri, 17 Mar 2006 22:11:17 +0000 (14:11 -0800)

Merge branch 'jc/cvsimport' into next

* jc/cvsimport:
cvsimport: honor -i and non -i upon subsequent imports

Merge branch 'jc/fetch' into nextJunio C Hamano Fri, 17 Mar 2006 22:11:10 +0000 (14:11 -0800)

Merge branch 'jc/fetch' into next

* jc/fetch:
fetch: exit non-zero when fast-forward check fails.

Merge branch 'ew/abbrev' into nextJunio C Hamano Fri, 17 Mar 2006 22:11:00 +0000 (14:11 -0800)

Merge branch 'ew/abbrev' into next

* ew/abbrev:
ls-files: add --abbrev[=<n>] option
ls-tree: add --abbrev[=<n>] option
blame: Fix git-blame <directory>
blame: Nicer output

fetch: exit non-zero when fast-forward check fails.Junio C Hamano Fri, 17 Mar 2006 06:04:18 +0000 (22:04 -0800)

fetch: exit non-zero when fast-forward check fails.

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

ls-files: add --abbrev[=<n>] optionEric Wong Tue, 7 Mar 2006 19:59:17 +0000 (11:59 -0800)

ls-files: add --abbrev[=<n>] option

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

ls-tree: add --abbrev[=<n>] optionEric Wong Tue, 7 Mar 2006 13:52:02 +0000 (05:52 -0800)

ls-tree: add --abbrev[=<n>] option

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

cvsimport: honor -i and non -i upon subsequent importsJunio C Hamano Fri, 17 Mar 2006 22:08:39 +0000 (14:08 -0800)

cvsimport: honor -i and non -i upon subsequent imports

Documentation says -i is "import only", so without it,
subsequent import should update the current branch and working
tree files in a sensible way.

"A sensible way" defined by this commit is "act as if it is a
git pull from foreign repository which happens to be CVS not
git". So:

- If importing into the current branch (note that cvsimport
requires the tracking branch is pristine -- you checked out
the tracking branch but it is your responsibility not to make
your own commits there), fast forward the branch head and
match the index and working tree using two-way merge, just
like "git pull" does.

- If importing into a separate tracking branch, update that
branch head, and merge it into your current branch, again,
just like "git pull" does.

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

blame: Fix git-blame <directory>Fredrik Kuivinen Fri, 17 Mar 2006 21:49:31 +0000 (22:49 +0100)

blame: Fix git-blame <directory>

Before this patch git-blame <directory> gave non-sensible output. (It
assigned blame to some random file in <directory>) Abort with an error
message instead.

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

blame: Nicer outputFredrik Kuivinen Fri, 17 Mar 2006 21:49:28 +0000 (22:49 +0100)

blame: Nicer output

As pointed out by Junio, it may be dangerous to cut off people's names
after 15 bytes. If the name is encoded in an encoding which uses more
than one byte per code point we may end up with outputting garbage.
Instead of trying to do something smart, just output the entire name.
We don't gain much screen space by chopping it off anyway.

Furthermore, only output the file name if we actually found any
renames.

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

Merge branch 'master' into nextJunio C Hamano Thu, 16 Mar 2006 00:15:23 +0000 (16:15 -0800)

Merge branch 'master' into next

* master:
fix imap-send for OSX
Let merge set the default strategy.

fix imap-send for OSXRandal L. Schwartz Wed, 15 Mar 2006 23:35:06 +0000 (15:35 -0800)

fix imap-send for OSX

This patch works... I've been using it to stay current.

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

Let merge set the default strategy.Mark Hollomon Wed, 15 Mar 2006 22:51:41 +0000 (22:51 +0000)

Let merge set the default strategy.

If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.

[jc: with minor stylistic tweaks]

Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'lt/diff' into nextJunio C Hamano Wed, 15 Mar 2006 21:19:52 +0000 (13:19 -0800)

Merge branch 'lt/diff' into next

* lt/diff:
diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).

diffcore-delta: 64-byte-or-EOL ultrafast replacement... Linus Torvalds Wed, 15 Mar 2006 08:37:57 +0000 (00:37 -0800)

diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).

The rotating 64-bit number was not really rotating, and worse
yet ulong was longer than 64-bit on 64-bit architectures X-<.

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

Merge branch 'master' into nextJunio C Hamano Wed, 15 Mar 2006 17:12:18 +0000 (09:12 -0800)

Merge branch 'master' into next

* master:
Fix broken slot reuse when fetching alternates

Fix broken slot reuse when fetching alternatesNick Hengeveld Wed, 15 Mar 2006 16:59:52 +0000 (08:59 -0800)

Fix broken slot reuse when fetching alternates

When fetching alternates, http-fetch may reuse the slot to fetch non-http
alternates if http-alternates does not exist. When doing so, it now needs
to update the slot's finished status so run_active_slot waits for the
non-http alternates request to finish.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'lt/diff' into nextJunio C Hamano Wed, 15 Mar 2006 08:38:47 +0000 (00:38 -0800)

Merge branch 'lt/diff' into next

* lt/diff:
diffcore-delta: 64-byte-or-EOL ultrafast replacement.

diffcore-delta: 64-byte-or-EOL ultrafast replacement.Linus Torvalds Wed, 15 Mar 2006 08:37:57 +0000 (00:37 -0800)

diffcore-delta: 64-byte-or-EOL ultrafast replacement.

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

Merge branch 'jc/pack'Junio C Hamano Mon, 13 Mar 2006 08:04:10 +0000 (00:04 -0800)

Merge branch 'jc/pack'

* jc/pack:
pack-objects: simplify "thin" pack.
verify-pack -v: show delta-chain histogram.

Merge branch 'jc/fsck'Junio C Hamano Mon, 13 Mar 2006 08:04:05 +0000 (00:04 -0800)

Merge branch 'jc/fsck'

* jc/fsck:
fsck-objects: Remove --standalone

Merge branch 'nh/http'Junio C Hamano Mon, 13 Mar 2006 08:01:57 +0000 (00:01 -0800)

Merge branch 'nh/http'

* nh/http:
http-push: cleanup
http-push: support for updating remote info/refs
http-push: improve remote lock management
http-push: refactor remote file/directory processing
HTTP slot reuse fixes
http-push: fix revision walk

Merge branch 'fk/blame'Junio C Hamano Mon, 13 Mar 2006 08:01:52 +0000 (00:01 -0800)

Merge branch 'fk/blame'

* fk/blame:
blame: Rename detection (take 2)
rev-lib: Make it easy to do rename tracking (take 2)
Make it possible to not clobber object.util in sort_in_topological_order (take 2)

Merge branch 'jc/diff' into nextJunio C Hamano Mon, 13 Mar 2006 07:45:42 +0000 (23:45 -0800)

Merge branch 'jc/diff' into next

* jc/diff:
Fix up diffcore-rename scoring

Fix up diffcore-rename scoringLinus Torvalds Mon, 13 Mar 2006 06:26:34 +0000 (22:26 -0800)

Fix up diffcore-rename scoring

The "score" calculation for diffcore-rename was totally broken.

It scaled "score" as

score = src_copied * MAX_SCORE / dst->size;

which means that you got a 100% similarity score even if src and dest were
different, if just every byte of dst was copied from src, even if source
was much larger than dst (eg we had copied 85% of the bytes, but _deleted_
the remaining 15%).

That's clearly bogus. We should do the score calculation relative not to
the destination size, but to the max size of the two.

This seems to fix it.

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

Merge branch 'jc/diff' into nextJunio C Hamano Mon, 13 Mar 2006 04:42:35 +0000 (20:42 -0800)

Merge branch 'jc/diff' into next

* jc/diff:
diffcore-delta: tweak hashbase value.

diffcore-delta: tweak hashbase value.Junio C Hamano Mon, 13 Mar 2006 04:32:06 +0000 (20:32 -0800)

diffcore-delta: tweak hashbase value.

This tweaks the maximum hashvalue we use to hash the string into
without making the maximum size of the hashtable can grow from
the current limit. With this, the renames detected becomes a
bit more precise without incurring additional paging cost.

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

Merge branch 'jc/diff' into nextJunio C Hamano Mon, 13 Mar 2006 01:27:32 +0000 (17:27 -0800)

Merge branch 'jc/diff' into next

* jc/diff:
diffcore-delta: make the hash a bit denser.