git/git.git
15 years agoGIT 0.99.9e v0.99.9e
Junio C Hamano [Mon, 7 Nov 2005 02:57:40 +0000 (18:57 -0800)]
GIT 0.99.9e

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agohttp-fetch: do not use curl_message after releasing it
Johannes Schindelin [Sun, 6 Nov 2005 23:59:39 +0000 (00:59 +0100)]
http-fetch: do not use curl_message after releasing it

When curl_message is released using curl_multi_remove_handle(), it's
contents are undefined. Therefore, get the information before releasing it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAllow GIT_DIR to be an absolute path
Johannes Schindelin [Sun, 6 Nov 2005 23:36:15 +0000 (00:36 +0100)]
Allow GIT_DIR to be an absolute path

This fixes a problem in safe_create_leading_directories() when the
argument starts with a '/' (i.e. the path is absolute).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agohttp-push.c: include with angle bracket, not dq.
Paul Collins [Sun, 6 Nov 2005 21:07:45 +0000 (21:07 +0000)]
http-push.c: include with angle bracket, not dq.

Do not search the current directory when including expat.h, since it
is not supplied by git.

Signed-off-by: Paul Collins <paul@briny.ondioline.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSet up remotes/origin to track all remote branches.
Junio C Hamano [Sun, 6 Nov 2005 08:52:57 +0000 (00:52 -0800)]
Set up remotes/origin to track all remote branches.

This implements the idea Daniel Barkalow came up with, to match
the remotes/origin created by clone by default to the workflow I
use myself in my guinea pig repository, to have me eat my own
dog food.

We probably would want to use either .git/refs/local/heads/*
(idea by Linus) or .git/refs/heads/origin/* instead to reduce
the local ref namespace pollution.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-status: do not mark unmerged paths as committable.
Junio C Hamano [Mon, 7 Nov 2005 01:37:40 +0000 (17:37 -0800)]
git-status: do not mark unmerged paths as committable.

An unmerged path appears as both "Updated but not checked in" list,
and "Changed but not updated" list.  We are not going to commit that
path until it is resolved, so remove it from the former list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files: --others should not say unmerged paths are unknown.
Junio C Hamano [Mon, 7 Nov 2005 01:26:31 +0000 (17:26 -0800)]
ls-files: --others should not say unmerged paths are unknown.

Jon Loeliger noticed that an unmerged path appears as
"Untracked" in git-status output, even though we show the same
path as updated/changed.  Since --others means "we have not told
git about that path", we should not show unmerged paths --
obviously, git knows about them; it just does not know what we
want to do about them yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUse fink/darwinport paths for OSX
Randal L. Schwartz [Sun, 6 Nov 2005 12:33:07 +0000 (04:33 -0800)]
Use fink/darwinport paths for OSX

There's no standard libexpat for OSX, so if you install it
after-market, it can end up in various directories.  Give
paths used by fink and darwinports by default to CFLAGS.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRefactor merge strategies into separate includable file.
Jon Loeliger [Sun, 6 Nov 2005 16:26:07 +0000 (10:26 -0600)]
Refactor merge strategies into separate includable file.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocument expat dependency when using http-push.
Junio C Hamano [Sat, 5 Nov 2005 19:12:05 +0000 (11:12 -0800)]
Document expat dependency when using http-push.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge in http-push first stage.
Junio C Hamano [Sun, 6 Nov 2005 09:27:15 +0000 (01:27 -0800)]
Merge in http-push first stage.

15 years agoRefresh the remote lock if it is about to expire
Nick Hengeveld [Fri, 4 Nov 2005 22:22:35 +0000 (14:22 -0800)]
Refresh the remote lock if it is about to expire

Refresh the remote lock if it is about to expire

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoImprove lock handling
Nick Hengeveld [Fri, 4 Nov 2005 22:22:31 +0000 (14:22 -0800)]
Improve lock handling

Improve lock handling: parse the server response for the timeout, owner,
and lock token

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSupport remote references with slashes in their names
Nick Hengeveld [Fri, 4 Nov 2005 22:22:25 +0000 (14:22 -0800)]
Support remote references with slashes in their names

Support remote references with slashes in their names

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoVerify remote packs, speed up pending request queue
Nick Hengeveld [Fri, 4 Nov 2005 22:22:18 +0000 (14:22 -0800)]
Verify remote packs, speed up pending request queue

Verify that remote packs exist before using the pack index, add requests to
the beginning of the queue to locate pending requests faster.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd support for pushing to a remote repository using HTTP/DAV
Nick Hengeveld [Wed, 2 Nov 2005 19:19:24 +0000 (11:19 -0800)]
Add support for pushing to a remote repository using HTTP/DAV

Add support for pushing to a remote repository using HTTP/DAV

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDebian: test build.
Junio C Hamano [Sat, 5 Nov 2005 20:54:40 +0000 (12:54 -0800)]
Debian: test build.

Update version number in changelog to match the 0.99.9.GIT version
number, to allow building private deb from wip.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFurther Debian split fixes.
Junio C Hamano [Sat, 5 Nov 2005 20:54:25 +0000 (12:54 -0800)]
Further Debian split fixes.

The doc installation was flattened, breaking links to howto/.
Silly cut&paste error made git-doc depend on tk8.4.  Doh.
Move most of the documentation (except manuals) to git-doc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoInstall asciidoc sources as well.
Junio C Hamano [Sat, 5 Nov 2005 20:52:56 +0000 (12:52 -0800)]
Install asciidoc sources as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoPackage split: Debian.
Junio C Hamano [Sat, 5 Nov 2005 10:39:42 +0000 (02:39 -0800)]
Package split: Debian.

As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSimplify CFLAGS/DEFINES in Makefile
Junio C Hamano [Sat, 5 Nov 2005 07:50:09 +0000 (23:50 -0800)]
Simplify CFLAGS/DEFINES in Makefile

I think the original intention was to make CFLAGS overridable
from the make command line, but somehow we ended up accumulating
conditional makefile sections that wrongly appends values to
CFLAGs.  These assignments do not work when the user actually
override them from the make command line!

DEFINES are handled the same way; it was seemingly overridable,
but the makefile sections had assignments, which meant
overriding it from the command line broke things.

This simplifies things by limiting the internal futzing to
ALL_CFLAGS, and by removing DEFINES altogether.  Overriding
CFLAGS from the command line should start working with this
change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-fetch: fail if specified refspec does not match remote.
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>
15 years agoDocumentation: 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>
15 years agogit-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>
15 years agotest: 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>
15 years agoGIT 0.99.9d v0.99.9d
Junio C Hamano [Sat, 5 Nov 2005 19:50:24 +0000 (11:50 -0800)]
GIT 0.99.9d

This is primarily to include the 'git clone -l' (without -s) fix,
first spotted and diagnosed by Linus and caused James Bottomley's
repository to become unreadable.  It also contains documentation
updates happened on the "master" branch since 0.99.9c

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-clone: fix local clone
Junio 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>
15 years agoinit-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>
15 years agocopy.c::copy_fd() - do not leak file descriptor on error return.
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>
15 years agoDocumentation: format-patch
Junio 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>
15 years agoformat-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>
15 years agoDocumentation: 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>
15 years agoAdded 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>
15 years agoDocument the --no-commit flag better
Junio 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>
15 years agoDocumentation: -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>
15 years agoDocumentation: 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>
15 years agogit-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>
15 years agoRemove the temp file if it is empty after the request has failed
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>
15 years agoGIT 0.99.9c v0.99.9c
Junio C Hamano [Thu, 3 Nov 2005 23:45:36 +0000 (15:45 -0800)]
GIT 0.99.9c

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIllustration: "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>
15 years agoIllustration: "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>
15 years agoIllustration: "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>
15 years agogit-merge-ours: make sure our index matches HEAD
Junio 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>
15 years agoAdd '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>
15 years agoAdd --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>
15 years agoDocument --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>
15 years agoBe 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>
15 years ago[PATCH] Clean up the SunOS Makefile rule
Peter 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>
15 years agoIgnore '\r' at the end of line in $GIT_DIR/config
Junio 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>
15 years agoremove CR/LF from .gitignore
Alex 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>
15 years agoDo 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>
15 years agoMake 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>
15 years agogit-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>
15 years agoDo not put automatic merge message after signed-off-by line.
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>
15 years agoGIT 0.99.9b v0.99.9b
Junio C Hamano [Wed, 2 Nov 2005 05:58:53 +0000 (21:58 -0800)]
GIT 0.99.9b

This contains the changes made on the master branch since 0.99.9a.

The workaround for building RPMs has not changed since 0.99.9a,
mainly because I haven't heard back if it was good enough for
kernel.org consumption, or otherwise what changes are needed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd -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>
15 years agocvsimport: cvsps should be quiet too
Martin 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>
15 years agocvsimport: introduce -P <cvsps-output-file> option
Martin 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>
15 years agocvsimport: catch error condition where cvs host disappears
Martin 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>
15 years agoDo 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>
15 years agoStrip any trailing slash on destination argument
Josef 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>
15 years agogit-am.txt is no stub anymore
Petr 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>
15 years agoDocumentation for git-fmt-merge-msg
Petr 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>
15 years agoRemove git-findtags.perl
Petr 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>
15 years agoRemove '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>
15 years agoFix constness of input in mozilla-sha1/sha1.c::SHA1_Update().
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>
15 years agoDocument 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>
15 years agoMerge branch 'fixes'
Junio C Hamano [Tue, 1 Nov 2005 02:08:22 +0000 (18:08 -0800)]
Merge branch 'fixes'

15 years agoAdd 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>
15 years agoGIT 0.99.9a v0.99.9a
Junio C Hamano [Mon, 31 Oct 2005 02:06:39 +0000 (18:06 -0800)]
GIT 0.99.9a

... to contain the RPM workaround.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoWork 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>
15 years agoFix 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>
15 years agoUpdate 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>
15 years agoUpdate 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>
15 years agoUpdate 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>
15 years agoAdd to usage and docs for git-add.sh
Chris 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>
15 years agoAdd to documentation of git-update-index arguments and usage.
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>
15 years agoAdd usage statement to git-checkout.sh
Chris 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>
15 years agoGIT 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>
15 years agoGIT 0.99.9 v0.99.9
Junio 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>
15 years agoDocumentation 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>
15 years agoDo 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>
15 years agoTeach 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>
15 years agoFix 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>
15 years agomake t5501 less annoying
Johannes 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>
15 years agofix 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>
15 years agogit-fetch-pack: Support multi_ack extension
Johannes 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>
15 years agogit-upload-pack: Support the multi_ack protocol
Johannes 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>
15 years agoSupport receiving server capabilities
Johannes 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>
15 years agogit-upload-pack: More efficient usage of the has_sha1 array
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>
15 years agoImplement an interoperability test for fetch-pack/upload-pack
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>
15 years agoImplement a test for git-fetch-pack/git-upload-pack
Johannes 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>
15 years agoMake maximal use of the remote refs
Johannes 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>
15 years agoSubject: [PATCH] git-fetch-pack: Do not use git-rev-list
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>
15 years agogit-apply --numstat
Junio 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>
15 years agoAdd usage help to git-push.sh
c.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>
15 years agoAdd usage help for git-reset.sh
c.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>
15 years agoMinor clarifications in diffcore documentation
c.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>
15 years agoRemove -r from common diff options documentation in one more place
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>
15 years agoupdate usage string for git-commit.sh
c.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>