gitweb.git
git-fetch: fail if specified refspec does not match... Junio C Hamano Sun, 6 Nov 2005 08:09:59 +0000 (00:09 -0800)

git-fetch: fail if specified refspec does not match remote.

'git-fetch remote no-such-ref' succeeded without fetching any
ref from the remote. Detect such case and report an error.

Note that this makes 'git-fetch remote master master' to fail,
because the remote branch 'master' matches the first refspec,
and the second refspec is left unmatched, which is detected by
the error checking logic. This is somewhat unintuitive, but
giving the same refspec more than once to git-fetch is useless
in any case so it should not be much of a problem. I'd accept a
patch to change this if somebody cares enough, though.

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

Documentation: pull/clone ref mapping clarification.Junio C Hamano Sun, 6 Nov 2005 06:26:52 +0000 (22:26 -0800)

Documentation: pull/clone ref mapping clarification.

Josef Weidendorfer points out that git-clone documentation does not
mention the initial copying of remote branch heads into corresponding
local branches. Also clarify the purpose of the ref mappings description
in the "remotes" file and recommended workflow.

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

git-format-patch: silly typo fix.Junio C Hamano Sun, 6 Nov 2005 08:21:45 +0000 (00:21 -0800)

git-format-patch: silly typo fix.

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

test: t4102-apply-rename fails with strict umask.Junio C Hamano Sat, 5 Nov 2005 21:08:18 +0000 (13:08 -0800)

test: t4102-apply-rename fails with strict umask.

We checked the result of patch application for full permission bits,
when the only thing we cared about was to make sure the executable
bit was correctly set.

Noticed by Peter Baumann.

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

git-clone: fix local cloneJunio C Hamano Sat, 5 Nov 2005 19:44:35 +0000 (11:44 -0800)

git-clone: fix local clone

If we let cpio to create the leading directories implicitly,
it ends up having funny perm bits (GNU cpio 2.5 and 2.6, at least).
This leaves .git/object/?? directories readable only by the owner.

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

init-db::copy_file() - use copy_fd()Junio C Hamano Sat, 5 Nov 2005 19:07:22 +0000 (11:07 -0800)

init-db::copy_file() - use copy_fd()

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

copy.c::copy_fd() - do not leak file descriptor on... Junio C Hamano Sat, 5 Nov 2005 19:02:56 +0000 (11:02 -0800)

copy.c::copy_fd() - do not leak file descriptor on error return.

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

Documentation: format-patchJunio C Hamano Sat, 5 Nov 2005 10:55:18 +0000 (02:55 -0800)

Documentation: format-patch

Add examples section and talk about using this to cherry-pick
commits.

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

format-patch: "rev1.." should mean "rev1..HEAD"Junio C Hamano Sat, 5 Nov 2005 10:47:07 +0000 (02:47 -0800)

format-patch: "rev1.." should mean "rev1..HEAD"

"rev1.." should mean "rev1..HEAD"; git-diff users are familiar
with that syntax.

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

Documentation: git-fetch/pull updates.Junio C Hamano Sat, 5 Nov 2005 09:37:00 +0000 (01:37 -0800)

Documentation: git-fetch/pull updates.

We do not accept multiple <refspecs> on one Pull:/Push: line
right now (we could lift this tentative workaround for the
broken refnames), but we have always accepted multiple such
lines, so use that form in the examples and discussion.

Also explicitly mention that Octopus is made only with an
explicit command line request and never from Pull: lines.

Add a couple of cross references.

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

Added a few examples to git-pull man page.Jon Loeliger Sat, 5 Nov 2005 02:36:08 +0000 (20:36 -0600)

Added a few examples to git-pull man page.

Clarified and added notes for pull/push refspecs.
Converted to back-ticks for literal text examples.

[jc: Also fixed git-pull description that still talked about its
calling git-resolve or git-octopus (we do not anymore; instead
we just call git-merge). BTW, I am reasonably impressed by how
well "git-am -3" applied this patch, which had some conflicts
because I've updated the documentation somewhat.]

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

Document the --no-commit flag betterJunio C Hamano Sat, 5 Nov 2005 02:17:16 +0000 (18:17 -0800)

Document the --no-commit flag better

Pasky and I did overlapping documentation independently; this is to
pick up better wordings from what he sent me.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation: -merge and -pull: describe merge strategies.Junio C Hamano Fri, 4 Nov 2005 08:06:20 +0000 (00:06 -0800)

Documentation: -merge and -pull: describe merge strategies.

... and give a couple of examples of running 'git pull' against
local repository.

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

Documentation: git-add -- do not say "cache", add examples.Junio C Hamano Fri, 4 Nov 2005 08:04:17 +0000 (00:04 -0800)

Documentation: git-add -- do not say "cache", add examples.

Its use of git-ls-files --others is very nice, but sometimes gives
surprising results, so we'd better talk about it.

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

git-tag: Do not assume the working tree root is writable.Junio C Hamano Thu, 3 Nov 2005 23:26:43 +0000 (15:26 -0800)

git-tag: Do not assume the working tree root is writable.

This is a long overdue companion commit that fixed git-commit
(Santi's f8e2c54c9a17af3319e96db1d9e97ace36ae6831).

Having the temporary files in the working tree root when making
tags is not as bad because it does not involve 'git status' as
the git-commit case, but this makes things more consistent.

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

Remove the temp file if it is empty after the request... Nick Hengeveld Fri, 4 Nov 2005 01:54:52 +0000 (17:54 -0800)

Remove the temp file if it is empty after the request has failed

After using cg-update to pull, empty files named *.temp are left in
the various subdirectories of .git/objects/. These are created by
git-http-fetch to hold data as it's being fetched from the remote
repository. They are left behind after a transfer error so that the
next time git-http-fetch runs it can pick up where it left off. If
they're empty though, it would make more sense to delete them rather
than leaving them behind for the next attempt.

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

Illustration: "Commit DAG Revision Naming"Junio C Hamano Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)

Illustration: "Commit DAG Revision Naming"

Jon Loeliger's ASCII art in the git-rev-parse(1) manual.

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

Illustration: "Git Diff Types"Junio C Hamano Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)

Illustration: "Git Diff Types"

Jon Loeliger's ASCII art in the Tutorial.

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

Illustration: "Fundamental Git Index Operations"Junio C Hamano Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)

Illustration: "Fundamental Git Index Operations"

Jon Loeliger's ASCII art in the Discussion section.

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

git-merge-ours: make sure our index matches HEADJunio C Hamano Thu, 3 Nov 2005 09:51:25 +0000 (01:51 -0800)

git-merge-ours: make sure our index matches HEAD

git-merge expects this check to be done appropriately by the
merge strategy backends. In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.

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

Add 'ours' merge strategy.Junio C Hamano Wed, 2 Nov 2005 03:34:49 +0000 (19:34 -0800)

Add 'ours' merge strategy.

This adds the coolest merge strategy ever, "ours". It can take
arbitrary number of foreign heads and merge them into the
current branch, with the resulting tree always taken from our
branch head, hence its name.

What this means is that you can declare that the current branch
supersedes the development histories of other branches using
this merge strategy.

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

Add --no-commit to git-merge/git-pull.Junio C Hamano Wed, 2 Nov 2005 03:30:11 +0000 (19:30 -0800)

Add --no-commit to git-merge/git-pull.

With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.

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

Document --since and --until options to rev-parse.Junio C Hamano Thu, 3 Nov 2005 07:41:25 +0000 (23:41 -0800)

Document --since and --until options to rev-parse.

The usability magic were hidden in the source code without being
documented, and even the maintainer did not know about them ;-).

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

Be careful when dereferencing tags.Junio C Hamano Wed, 2 Nov 2005 23:19:13 +0000 (15:19 -0800)

Be careful when dereferencing tags.

One caller of deref_tag() was not careful enough to make sure
what deref_tag() returned was not NULL (i.e. we found a tag
object that points at an object we do not have). Fix it, and
warn about refs that point at such an incomplete tag where
needed.

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

[PATCH] Clean up the SunOS Makefile rulePeter Eriksen Wed, 2 Nov 2005 19:27:31 +0000 (20:27 +0100)

[PATCH] Clean up the SunOS Makefile rule

Don't set a non-standard CURLDIR as default, and fix an error
in Solaris 10 by setting NEEDS_LIBICONV.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Ignore '\r' at the end of line in $GIT_DIR/configJunio C Hamano Wed, 2 Nov 2005 21:02:57 +0000 (13:02 -0800)

Ignore '\r' at the end of line in $GIT_DIR/config

Unfortunate people may have to use $GIT_DIR/config edited on
DOSsy machine on UNIXy machine. Ignore '\r' immediately
followed by '\n'.

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

remove CR/LF from .gitignoreAlex Riesen Wed, 2 Nov 2005 13:05:45 +0000 (14:05 +0100)

remove CR/LF from .gitignore

For everyone cursed by dos/windows line endings (aka CRLF):

The code reading the .gitignore files (excludes and excludes per
directory) leaves \r in the patterns, which causes fnmatch to fail for
no obvious reason. Just remove a "\r" preceding a "\n"
unconditionally.

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

Do not fail on hierarchical branch names.Junio C Hamano Wed, 2 Nov 2005 20:17:47 +0000 (12:17 -0800)

Do not fail on hierarchical branch names.

"git-checkout -b frotz/nitfol master" failed to create
$GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated
$GIT_DIR/HEAD to point at it, resulting in a corrupt repository.
Exit when we cannot create the new branch with an error status.

While we are at it, there is no reason to forbid subdirectories
in refs/heads, so make sure we handle that correctly.

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

Make test-date buildable again.Junio C Hamano Wed, 2 Nov 2005 20:01:06 +0000 (12:01 -0800)

Make test-date buildable again.

Now we define and use our own ctype-replacement, we need to link
with it.

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

git-clone: do not forget to create origin branch.Junio C Hamano Wed, 2 Nov 2005 06:19:36 +0000 (22:19 -0800)

git-clone: do not forget to create origin branch.

The newly cloned repository by default had .git/remotes/origin
set up to track the remote master to origin, but forgot to
create the origin branch ourselves. Also it hardcoded the
assumption that the remote HEAD points at "master", which may
not always be true.

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

Do not put automatic merge message after signed-off... Junio C Hamano Wed, 2 Nov 2005 06:01:28 +0000 (22:01 -0800)

Do not put automatic merge message after signed-off-by line.

'git-commit -s' after a failed automerge inserted the automerge
message in a wrong place. The signed-off-by line should come
last.

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

Add -P to the documentation head.Junio C Hamano Wed, 2 Nov 2005 01:07:21 +0000 (17:07 -0800)

Add -P to the documentation head.

This is a companion patch for 211dcac6430cdf77fcf2a968ffaf9313b5c059b0
commit, to add the newly introduced -P option to the list of options.

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

cvsimport: cvsps should be quiet tooMartin Langhoff Wed, 2 Nov 2005 00:53:23 +0000 (13:53 +1300)

cvsimport: cvsps should be quiet too

Tell cvsps to be quiet, unless we've been told to be verbose.

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

cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff Wed, 2 Nov 2005 00:48:47 +0000 (13:48 +1300)

cvsimport: introduce -P <cvsps-output-file> option

-P:: <cvsps-output-file>
Instead of calling cvsps, read the provided cvsps output file. Useful
for debugging or when cvsps is being handled outside cvsimport.

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

cvsimport: catch error condition where cvs host disappearsMartin Langhoff Wed, 2 Nov 2005 00:48:22 +0000 (13:48 +1300)

cvsimport: catch error condition where cvs host disappears

Add error handling for cases where the cvs server goes away unexpectedly.
While I don't know why the cvs server is so erratic, we should definitely
exit here before committing bogus files.

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

Do not install backward compatibility links anymore.Junio C Hamano Wed, 2 Nov 2005 00:46:38 +0000 (16:46 -0800)

Do not install backward compatibility links anymore.

This is a companion patch to 4f9dcf7e5cf6c82455925102d315daf3b833e6d6
which stops mentioning the old command names. As promised, we do not
install symlinks to let people use backward compatibility names anymore.

cmd-rename.sh script is still shipped to help people who installed
previous git by hand to clean up the leftover symlinks.

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

Strip any trailing slash on destination argumentJosef Weidendorfer Tue, 1 Nov 2005 22:46:27 +0000 (23:46 +0100)

Strip any trailing slash on destination argument

Needed because generating a target paths will add another slash.
This fixes e.g. "git-mv file dir/", which removed "file" from
version control by renaming it to "dir//file", as
git-update-index does not accept such paths.

Thanks goes to Ben Lau for noting this bug.

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

git-am.txt is no stub anymorePetr Baudis Tue, 1 Nov 2005 20:47:10 +0000 (21:47 +0100)

git-am.txt is no stub anymore

That notice was added by me for the emergency documentation, but Junio
already expanded it to a full-fledged manual page. This patch removes
the notice.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Documentation for git-fmt-merge-msgPetr Baudis Tue, 1 Nov 2005 20:45:55 +0000 (21:45 +0100)

Documentation for git-fmt-merge-msg

Simple description. It appears to be mostly internal command, but hey, it
is (it seems) the only undocumented one, so let's fix it up...

Also add a note about it to git-merge documentation.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Remove git-findtags.perlPetr Baudis Tue, 1 Nov 2005 20:26:03 +0000 (21:26 +0100)

Remove git-findtags.perl

This script was superseded by git-name-rev, which is more versatile,
actually documented, faster, and everything else...

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Remove 'Previously this command was known as ...' messages.Jon Loeliger Tue, 1 Nov 2005 20:22:22 +0000 (14:22 -0600)

Remove 'Previously this command was known as ...' messages.

For a 1.0 release, there is no need to maintain the
historical "Previously this command was known as..."
information on the doc splash page. It is noise;
command names should stand on their own now.

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

Fix constness of input in mozilla-sha1/sha1.c::SHA1_Upd... Junio C Hamano Tue, 1 Nov 2005 18:56:03 +0000 (10:56 -0800)

Fix constness of input in mozilla-sha1/sha1.c::SHA1_Update().

Among the three of our own implementations, only this one lacked
"const" from the second argument.

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

Document the use of "current directory" as pull source.Junio C Hamano Tue, 1 Nov 2005 22:03:13 +0000 (14:03 -0800)

Document the use of "current directory" as pull source.

The repository to pull from can be a local repository, and as a
special case the current directory can be specified to perform
merges across local branches.

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

Add examples for git-log documentation and others.Linus Torvalds Mon, 31 Oct 2005 04:05:32 +0000 (20:05 -0800)

Add examples for git-log documentation and others.

I don't think people really follow the links or think very abstractly at
all in the first place.

So I was thinking more of some explicit examples. I actually think every
command should have an example in the man-page, and hey, here's a patch to
start things off.

Of course, I'm not exactly "Mr Documentation", and I don't know that this
is the prettiest way to do this, but I checked that the resulting html and
man-page seems at least reasonable.

And hey, if the examples look like each other, that's just because I'm
also not "Mr Imagination".

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

Work around an RPM build problem.Junio C Hamano Sun, 30 Oct 2005 23:07:01 +0000 (15:07 -0800)

Work around an RPM build problem.

The require statement at the top of git-svnimport seems to confuse
rpmbuild dependency generation. It uses the newer notation "v5.8.0",
and rpm ends up requiring "perl(v5.8.0)", while we would want it to
say something like "perl >= 0:5.008".

Ryan suggests old-style "require 5.008" might fix this problem, so
here it is.

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

Fix rev-list documentation again (--sparse and pathspec)Junio C Hamano Sun, 30 Oct 2005 22:23:47 +0000 (14:23 -0800)

Fix rev-list documentation again (--sparse and pathspec)

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

Update git-pack-objects documentation.Junio C Hamano Sun, 30 Oct 2005 09:14:33 +0000 (01:14 -0800)

Update git-pack-objects documentation.

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

Update git-rev-list options list in rev-parse.Junio C Hamano Sun, 30 Oct 2005 09:08:35 +0000 (01:08 -0800)

Update git-rev-list options list in rev-parse.

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

Update usage string and documentation for git-rev-list.Junio C Hamano Sun, 30 Oct 2005 09:03:45 +0000 (01:03 -0800)

Update usage string and documentation for git-rev-list.

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

Add to usage and docs for git-add.shChris Shoemaker Sat, 29 Oct 2005 21:46:41 +0000 (17:46 -0400)

Add to usage and docs for git-add.sh

Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add to documentation of git-update-index arguments... Chris Shoemaker Sat, 29 Oct 2005 21:46:41 +0000 (17:46 -0400)

Add to documentation of git-update-index arguments and usage.

Removed unknown [--version] option.

Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add usage statement to git-checkout.shChris Shoemaker Sat, 29 Oct 2005 21:46:41 +0000 (17:46 -0400)

Add usage statement to git-checkout.sh

Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

GIT 0.99.9 master branch.Junio C Hamano Mon, 31 Oct 2005 01:27:38 +0000 (17:27 -0800)

GIT 0.99.9 master branch.

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

GIT 0.99.9 v0.99.9Junio C Hamano Sat, 29 Oct 2005 21:35:11 +0000 (14:35 -0700)

GIT 0.99.9

Done in 0.99.9
==============

Ports
~~~~~

* Cygwin port [HPA].

* OpenBSD build [Merlyn and others].

Fixes
~~~~~

* clone request over git native protocol from a repository with
too many refs did not work; this has been fixed.

* git-daemon got safer for kernel.org use [HPA].

* Extended SHA1 parser was not enforcing uniqueness for
abbreviated SHA1; this has been fixed.

* http transport does not barf on funny characters in URL.

* The ref naming restrictions have been formalized and the
coreish refuses to create funny refs; we still need to audit
importers. See git-check-ref-format(1).

New Features and Commands
~~~~~~~~~~~~~~~~~~~~~~~~~

* .git/config file as a per-repository configuration mechanism,
and some commands understand it [Linus]. See
git(7).

* The core.filemode configuration item can be used to make us a
bit more FAT friendly. See git(7).

* The extended SHA1 notation acquired Peel-the-onion operator
^{type} and ^{}. See git-rev-parse(1).

* SVN importer [Matthias]. See git-svnimport(1).

* .git/objects/[0-9a-f]{2} directories are created on demand,
and removed when becomes empty after prune-packed [Linus].

* Filenames output from various commands without -z option are
quoted when they embed funny characters (TAB and LF) using
C-style quoting within double-quotes, to match the proposed
GNU diff/patch notation [me, but many people contributed in
the discussion].

* git-mv is expected to be a better replacement for git-rename.
While the latter has two parameter restriction, it acts more
like the regular 'mv' that can move multiple things to one
destinatino directory [Josef Weidendorfer].

* git-checkout can take filenames to revert the changes to
them. See git-checkout(1)

* The new program git-am is a replacement for git-applymbox that
has saner command line options and a bit easier to use when a
patch does not apply cleanly.

* git-ls-remote can show unwrapped onions using ^{} notation, to
help Cogito to track tags.

* git-merge-recursive backend can merge unrelated projects.

* git-clone over native transport leaves the result packed.

* git-http-fetch issues multiple requests in parallel when
underlying cURL library supports it [Nick and Daniel].

* git-fetch-pack and git-upload-pack try harder to figure out
better common commits [Johannes].

* git-read-tree -u removes a directory when it makes it empty.

* git-diff-* records abbreviated SHA1 names of original and
resulting blob; this sometimes helps to apply otherwise an
unapplicable patch by falling back to 3-way merge.

* git-format-patch now takes series of from..to rev ranges and
with '-m --stdout', writes them out to the standard output.
This can be piped to 'git-am' to implement cheaper
cherry-picking.

* git-tag takes '-u' to specify the tag signer identity [Linus].

* git-rev-list can take optional pathspecs to skip commits that
do not touch them (--dense) [Linus].

* Comes with new and improved gitk [Paulus and Linus].

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

Documentation updates.Junio C Hamano Sat, 29 Oct 2005 21:32:56 +0000 (14:32 -0700)

Documentation updates.

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

Do not mmap-copy the whole thing; just use copy_fd()Junio C Hamano Sat, 29 Oct 2005 20:11:36 +0000 (13:11 -0700)

Do not mmap-copy the whole thing; just use copy_fd()

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

Teach local-fetch about lazy object directories.Junio C Hamano Sat, 29 Oct 2005 20:02:18 +0000 (13:02 -0700)

Teach local-fetch about lazy object directories.

The latest init-db does not create .git/objects/??/ directories
anymore and expects the users of the repository to create them
as they are needed. local-fetch was not taught about it, which
broke local cloning with Cogito.

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

Fix recent documentation format breakage.Junio C Hamano Sat, 29 Oct 2005 07:50:42 +0000 (00:50 -0700)

Fix recent documentation format breakage.

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

make t5501 less annoyingJohannes Schindelin Fri, 28 Oct 2005 03:59:29 +0000 (05:59 +0200)

make t5501 less annoying

On Linux, "mktemp tmp-XXXX" will not work. Also, redirect stderr on which,
so it does not complain too loudly. After all, this test should only be
executed when old binaries are available.

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

fix multi_ack.Johannes Schindelin Fri, 28 Oct 2005 03:56:41 +0000 (05:56 +0200)

fix multi_ack.

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

git-fetch-pack: Support multi_ack extensionJohannes Schindelin Fri, 28 Oct 2005 02:50:26 +0000 (04:50 +0200)

git-fetch-pack: Support multi_ack extension

The client side support for multi_ack.

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

git-upload-pack: Support the multi_ack protocolJohannes Schindelin Fri, 28 Oct 2005 02:49:16 +0000 (04:49 +0200)

git-upload-pack: Support the multi_ack protocol

This implements three things (trying very hard to be backwards
compatible):

It sends the "multi_ack" capability via the mechanism proposed by
Sergey Vlasov.

When the client sends "multi_ack" with at least one "want", multi_ack
is enabled.

When multi_ack is enabled, "continue" is appended to each "ACK" until
either the server can not store more refs, or "done" is received.

In contrast to the original protocol, as long as "continue" is sent,
flushes are answered by a "NAK" (not just until an "ACK" was sent),
and if "continue" was sent at least once, the last message is an
"ACK" without "continue".

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

Support receiving server capabilitiesJohannes Schindelin Fri, 28 Oct 2005 02:48:54 +0000 (04:48 +0200)

Support receiving server capabilities

This patch implements the client side of backward compatible upload-pack
protocol extension, <20051027141619.0e8029f2.vsu@altlinux.ru> by Sergey.

The updated server can append "server_capabilities" which is supposed
to be a string containing space separated features of the server, after
one of elements in the initial list of SHA1-refname line, hidden with
an embedded NUL.

After get_remote_heads(), check if the server supports the feature like

if (server_supports("multi_ack"))
do_something();

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

git-upload-pack: More efficient usage of the has_sha1... Johannes Schindelin Fri, 28 Oct 2005 02:48:32 +0000 (04:48 +0200)

git-upload-pack: More efficient usage of the has_sha1 array

This patch is based on Junio's proposal. It marks parents of common revs
so that they do not clutter up the has_sha1 array.

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

Implement an interoperability test for fetch-pack/uploa... Johannes Schindelin Fri, 28 Oct 2005 02:48:03 +0000 (04:48 +0200)

Implement an interoperability test for fetch-pack/upload-pack

The next patches will extend the pack protocol. This test assures that this
extension is compatible to earlier versions of git-fetch-pack/git-upload-pack.

All you need to do to take advantage of this test, is to install older
known-to-be-working binaries in the path as "old-git-fetch-pack" and
"old-git-upload-pack".

Note that the warning when testing with old-git-fetch-pack is to be
expected (it just says that the old version was not taking advantage
of all the information which the server sent).

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

Implement a test for git-fetch-pack/git-upload-packJohannes Schindelin Fri, 28 Oct 2005 02:47:38 +0000 (04:47 +0200)

Implement a test for git-fetch-pack/git-upload-pack

This test provides a minimal example of what went wrong with the old
git-fetch-pack (and now works beautifully).

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

Make maximal use of the remote refsJohannes Schindelin Fri, 28 Oct 2005 02:47:07 +0000 (04:47 +0200)

Make maximal use of the remote refs

When git-fetch-pack gets the remote refs, it does not need to filter them
right away, but it can see which refs are common (taking advantage of the
patch which makes git-fetch-pack not use git-rev-list).

This means that we ask get_remote_heads() to return all remote refs,
including the funny refs, and filtering them with a separate function later.

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

Subject: [PATCH] git-fetch-pack: Do not use git-rev... Johannes Schindelin Fri, 28 Oct 2005 02:46:27 +0000 (04:46 +0200)

Subject: [PATCH] git-fetch-pack: Do not use git-rev-list

The code used to call git-rev-list to enumerate the local revisions.
A disadvantage of that method was that git-rev-list, lacking a
control apart from the command line, would happily enumerate
ancestors of acknowledged common commits, which was just taking
unnecessary bandwidth.

Therefore, do not use git-rev-list on the fetching side, but rather
construct the list on the go. Send the revisions starting from the
local heads, ignoring the revisions known to be common.

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

git-apply --numstatJunio C Hamano Fri, 28 Oct 2005 09:43:31 +0000 (02:43 -0700)

git-apply --numstat

The new option, --numstat, shows number of inserted and deleted
lines for each path. It is similar to --stat output but is
meant to be more machine friendly by giving number of added and
deleted lines and unabbreviated paths.

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

Add usage help to git-push.shc.shoemaker@cox.net Sat, 29 Oct 2005 04:16:33 +0000 (00:16 -0400)

Add usage help to git-push.sh

Also clarify failure to push to read-only remote. Especially,
state why rsync:// is not used for pushing.

[jc: ideally rsync should not be used for anything]

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add usage help for git-reset.shc.shoemaker@cox.net Sat, 29 Oct 2005 04:16:20 +0000 (00:16 -0400)

Add usage help for git-reset.sh

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Minor clarifications in diffcore documentationc.shoemaker@cox.net Sat, 29 Oct 2005 04:15:49 +0000 (00:15 -0400)

Minor clarifications in diffcore documentation

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Remove -r from common diff options documentation in... c.shoemaker@cox.net Sat, 29 Oct 2005 04:16:01 +0000 (00:16 -0400)

Remove -r from common diff options documentation in one more place

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

update usage string for git-commit.shc.shoemaker@cox.net Sat, 29 Oct 2005 04:16:12 +0000 (00:16 -0400)

update usage string for git-commit.sh

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-push.sh: Retain cuteness, add helpfulness.c.shoemaker@cox.net Sat, 29 Oct 2005 04:17:17 +0000 (00:17 -0400)

git-push.sh: Retain cuteness, add helpfulness.

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Be more careful about reference parsingLinus Torvalds Fri, 28 Oct 2005 19:41:49 +0000 (12:41 -0700)

Be more careful about reference parsing

This does two things:

- we don't allow "." and ".." as components of a refname. Thus get_sha1()
will not accept "./refname" as being the same as "refname" any more.

- git-rev-parse stops doing revision translation after seeing a pathname,
to match the brhaviour of all the tools (once we see a pathname,
everything else will also be parsed as a pathname).

Basically, if you did

git log *

and "gitk" was somewhere in the "*", we don't want to replace the filename
"gitk" with the SHA1 of the branch with the same name.

Of course, if there is any change of ambiguity, you should always use "--"
to make it explicit what are filenames and what are revisions, but this
makes the normal cases sane. The refname rule also means that instead of
the "--", you can do the same thing we're used to doing with filenames
that start with a slash: use "./filename" instead, and now it's a
filename, not an option (and not a revision).

So "git log ./*.c" is now actually a perfectly valid thing to do, even if
the first C-file might have the same name as a branch.

Trivial test:

git-rev-parse gitk ./gitk gitk

should output something like

9843c3074dfbf57117565f6b7c93e3e6812857ee
./gitk
gitk

where the "./gitk" isn't seen as a revision, and the second "gitk" is a
filename simply because we've seen filenames already, and thus stopped
doing revision parsing.

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

Be marginally more careful about removing objectsLinus Torvalds Fri, 28 Oct 2005 16:45:53 +0000 (09:45 -0700)

Be marginally more careful about removing objects

The git philosophy when it comes to disk accesses is "Laugh in the face of
danger".

Notably, since we never modify an existing object, we don't really care
that deeply about flushing things to disk, since even if the machine
crashes in the middle of a git operation, you can never really have lost
any old work. At most, you'd need to figure out the proper heads (which
git-fsck-objects can do for you) and re-do the operation.

However, there's two exceptions to this: pruning and repacking. Those
operations will actually _delete_ old objects that they know about in
other ways (ie that they just repacked, or that they have found in other
places).

However, since they actually modify old state, we should thus be a bit
more careful about them. If the machine crashes and the duplicate new
objects haven't been flushed to disk, you can actually be in trouble.

This is trivially stupid about it by calling "sync" before removing the
objects. Not very smart, but we're talking about special operations than
are usually done once a week if that.

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

Documentation changes to recursive option for git-diff... Chris Shoemaker Fri, 28 Oct 2005 17:04:49 +0000 (13:04 -0400)

Documentation changes to recursive option for git-diff-tree

Update docs and usages regarding '-r' recursive option for git-diff-tree.
Remove '-r' from common diff options, mention it only for git-diff-tree.
Remove one extraneous use of '-r' with git-diff-files in get-merge.sh.
Sync the synopsis and usage string for git-diff-tree.

Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fix testsuite to tolerate spaces in pathPavel Roskin Fri, 28 Oct 2005 03:00:43 +0000 (23:00 -0400)

fix testsuite to tolerate spaces in path

This patch allows the testsuite to run properly when the full path to
the git sources contains spaces or other symbols that need to be quoted.

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

Document git-patch-id a bit better.Junio C Hamano Fri, 28 Oct 2005 09:39:56 +0000 (02:39 -0700)

Document git-patch-id a bit better.

Pavel Roskin wondered what the SHA1 output at the beginning of
git-diff-tree was about. The only consumer of that information
so far is this git-patch-id command, which was inadequately
documented.

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

Add more generated files to .gitignoreJohannes Schindelin Thu, 27 Oct 2005 10:03:43 +0000 (12:03 +0200)

Add more generated files to .gitignore

git-name-rev, git-mv and git-shell are recent additions to git.

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

Link git-name-rev and git-symbolic-ref from the main... Johannes Schindelin Thu, 27 Oct 2005 09:57:44 +0000 (11:57 +0200)

Link git-name-rev and git-symbolic-ref from the main git page

According to my checks, these were the only commands not yet linked.

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

Create object subdirectories on demand (phase II)Linus Torvalds Sun, 9 Oct 2005 09:30:17 +0000 (02:30 -0700)

Create object subdirectories on demand (phase II)

This removes the unoptimization. The previous round does not mind
missing fan-out directories, but still makes sure they exist, lest
older versions choke on a repository created/packed by it.

This round does not play that nicely anymore -- empty fan-out
directories are not created by init-db, and will stay removed by
prune-packed. The prune command also removes empty fan-out directories.

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

Merge branch 'js-fat'Junio C Hamano Thu, 27 Oct 2005 07:15:24 +0000 (00:15 -0700)

Merge branch 'js-fat'

Merge branch 'lt-dense'Junio C Hamano Thu, 27 Oct 2005 07:15:15 +0000 (00:15 -0700)

Merge branch 'lt-dense'

Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano Thu, 27 Oct 2005 07:14:46 +0000 (00:14 -0700)

Merge http://www.kernel.org/pub/scm/gitk/gitk

[PATCH] Make "gitk" work better with dense revlistsLinus Torvalds Tue, 25 Oct 2005 20:01:42 +0000 (13:01 -0700)

[PATCH] Make "gitk" work better with dense revlists

To generate the diff for a commit, gitk used to do

git-diff-tree -p -C $p $id

(and same thing to generate filenames, except using just "-r" there) which
does actually generate the diff from the parent to the $id, exactly like
it meant to do.

However, that really sucks with --dense, where the "parent" information
has all been rewritten to point to the previous commit. The diff actually
works exactly right, but now it's the diff of the _whole_ sequence of
commits all the way to the previous commit that last changed the file(s)
that we are looking at.

And that's really not what we want 99.9% of the time, even if it may be
perfectly sensible. Not only will the diff not actually match the commit
message, but it will usually be _huge_, and all of it will be totally
uninteresting to us, since we were only interested in a particular set of
files.

It also doesn't match what we do when we write the patch to a file.

So this makes gitk just show the diff of _that_ commit.

We might even want to have some way to limit the diff to only the
filenames we're interested in, but it's often nice to see what else
changed at the same time, so that's secondary.

The merge diff handling is left alone, although I think that should also
be changed to only look at what that _particular_ merge did, not what it
did when compared to the faked-out parents.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

git-rev-list: do not forget non-commit refsLinus Torvalds Wed, 26 Oct 2005 15:18:13 +0000 (08:18 -0700)

git-rev-list: do not forget non-commit refs

What happens is that the new logic decides that if it can't look up a
commit reference (ie "get_commit_reference()" returns NULL), the thing
must be a pathname.

Fair enough.

But wrong.

The thing is, it may be a perfectly fine ref that _isn't_ a commit. In
git, you have a tag that points to your PGP key, and in the kernel, I have
a tag that points to a tree (and a direct ref that points to that tree
too, for that matter).

So the rule is (as for all the other programs that mix revs and pathnames)
not that we only accept commit references, but _any_ valid object ref.

If the object then isn't a commit ref, git-rev-list will either ignore it,
or add it to the list of non-commit objects (if using "--objects").

The solution is to move the "get_sha1()" out of get_commit_reference(),
and into the callers. In fact, we already _have_ the SHA1 in the case of
the handle_all() loop, since for_each_ref() will have done it for us, so
this is the correct thing to do anyway.

This patch (on top of the original one) does exactly that.

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

git-rev-list: make --dense the default (and introduce... Linus Torvalds Tue, 25 Oct 2005 22:24:55 +0000 (15:24 -0700)

git-rev-list: make --dense the default (and introduce "--sparse")

This actually does three things:

- make "--dense" the default for git-rev-list. Since dense is a no-op if
no filenames are given, this doesn't actually change any historical
behaviour, but it's logically the right default (if we want to prune on
filenames, do it fully. The sparse "merge-only" thing may be useful,
but it's not what you'd normally expect)

- make "git-rev-parse" show the default revision control before it shows
any pathnames.

This was a real bug, but nobody would ever have noticed, because
the default thing tends to only make sense for git-rev-list, and
git-rev-list didn't use to take pathnames.

- it changes "git-rev-list" to match the other commands that take a mix
of revisions and filenames - it no longer requires the "--" before
filenames (although you still need to do it if a filename could be
confused with a revision name, eg "gitk" in the git archive)

This all just makes for much more pleasant and obvous usage. Just doing a

gitk t/

does the obvious thing: it will show the history as it concerns the "t/"
subdirectory.

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

Test in git-init-db if the filemode can be trustedJohannes Schindelin Tue, 25 Oct 2005 23:43:03 +0000 (01:43 +0200)

Test in git-init-db if the filemode can be trusted

... and if not, write an appropriate .git/config. Of course, that happens
only if no config file was yet created (by a template or a hook).

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

Add git-name-revJohannes Schindelin Wed, 26 Oct 2005 13:10:20 +0000 (15:10 +0200)

Add git-name-rev

git-name-rev tries to find nice symbolic names for commits. It does so by
walking the commits from the refs. When the symbolic name is ambiguous, the
following heuristic is applied: Try to avoid too many ~'s, and if two ambiguous
names have the same count of ~'s, take the one whose last number is smaller.

With "--tags", the names are derived only from tags.

With "--stdin", the stdin is parsed, and after every sha1 for which a name
could be found, the name is appended. (Try "git log | git name-rev --stdin".)

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

pack-objects: Allow use of pre-generated pack.Junio C Hamano Sat, 22 Oct 2005 08:28:13 +0000 (01:28 -0700)

pack-objects: Allow use of pre-generated pack.

git-pack-objects can reuse pack files stored in $GIT_DIR/pack-cache
directory, when a necessary pack is found. This is hopefully useful
when upload-pack (called from git-daemon) is expected to receive
requests for the same set of objects many times (e.g full cloning
request of any project, or updates from the set of heads previous day
to the latest for a slow moving project).

Currently git-pack-objects does *not* keep pack files it creates for
reusing. It might be useful to add --update-cache option to it,
which would allow it store pack files it created in the pack-cache
directory, and prune rarely used ones from it.

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

Fix what to do and how to detect when hardlinking failsLinus Torvalds Wed, 26 Oct 2005 17:27:36 +0000 (10:27 -0700)

Fix what to do and how to detect when hardlinking fails

Recent FAT workaround caused compilation trouble on OpenBSD;
different platforms use different error codes when we try to
hardlink the temporary file to its final location. Existing
Coda hack also checks its own error code, but the thing is,
the case we care about is if link failed for a reason other
than that the final file has already existed (which would be
normal, or it could mean collision). So just check the error
code against EEXIST.

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

Fix cloning (memory corruption)Johannes Schindelin Wed, 26 Oct 2005 14:18:56 +0000 (16:18 +0200)

Fix cloning (memory corruption)

upload-pack would set create_full_pack=1 if nr_has==0, but would ask later
if nr_needs<MAX_NEEDS. If that proves true, it would ignore create_full_pack,
and arguments would be written into unreserved memory.

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

upload-pack: tighten request validation.Junio C Hamano Tue, 25 Oct 2005 01:59:18 +0000 (18:59 -0700)

upload-pack: tighten request validation.

This makes sure what the other end asks for are among what we
offered to give them. Otherwise we would end up running
git-rev-list with 20-byte nonsense, only to find it either die
(because the object was not found) or waste time (because we
ended up serving that phony 'client').

Also avoid wasting needs_sha1 pool to record duplicates, and
detect cloning requests better.

[this used to be on top of Johannes fetch-pack enhancements,
which we are rewinding it for further testing for now, so
the commit is rebased.]

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

Work around missing hard links on FAT formatted mediaJohannes Schindelin Tue, 25 Oct 2005 23:41:20 +0000 (01:41 +0200)

Work around missing hard links on FAT formatted media

FAT -- like Coda -- does not like cross-directory hard links. To be
precise, FAT does not like links at all. But links are not needed either.
So get rid of them.

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

create_symref: if symlink fails, fall back to writing... Johannes Schindelin Tue, 25 Oct 2005 23:40:31 +0000 (01:40 +0200)

create_symref: if symlink fails, fall back to writing a "symbolic ref"

There are filesystems out there which do not understand symlinks, even if
the OS is perfectly capable of writing them. So, do not fail right away,
but try to write a symbolic ref first. If that fails, you can die().

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

Add [v]iew patch in git-am interactive.Junio C Hamano Wed, 26 Oct 2005 06:43:59 +0000 (23:43 -0700)

Add [v]iew patch in git-am interactive.

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

git-am: make it easier after fixing up an unapplicable... Junio C Hamano Wed, 26 Oct 2005 06:35:37 +0000 (23:35 -0700)

git-am: make it easier after fixing up an unapplicable patch.

Instead of having the user to edit the mail message, let the hand merge
result stored in .dotest/patch and continue, which is easier to manage.

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

git-rev-list: fix "--dense" flagLinus Torvalds Tue, 25 Oct 2005 18:50:46 +0000 (11:50 -0700)

git-rev-list: fix "--dense" flag

Right now --dense will _always_ show the root commit. I didn't do the
logic that does the diff against an empty tree. I was lazy.

This patch does that. The first round was incorrect but
this patch is even slightly tested, and might do a better job.

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