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: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This fixes a problem in safe_create_leading_directories() when the
argument starts with a '/' (i.e. the path is absolute).
Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Do not search the current directory when including expat.h, since it
is not supplied by git.
Signed-off-by: NPaul Collins <paul@briny.ondioline.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

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

Refresh the remote lock if it is about to expire
Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Improve lock handling: parse the server response for the timeout, owner,
and lock token
Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Support remote references with slashes in their names
Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Add support for pushing to a remote repository using HTTP/DAV
Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Update version number in changelog to match the 0.99.9.GIT version
number, to allow building private deb from wip.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

'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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

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: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

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

Add examples section and talk about using this to cherry-pick
commits.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

"rev1.." should mean "rev1..HEAD"; git-diff users are familiar
with that syntax.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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: NJon Loeliger <jdl@freescale.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Pasky and I did overlapping documentation independently; this is to
pick up better wordings from what he sent me.
Signed-off-by: NPetr Baudis <pasky@suse.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

... and give a couple of examples of running 'git pull' against
local repository.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>

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

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: NJunio C Hamano <junkio@cox.net>

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: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Jon Loeliger's ASCII art in the git-rev-parse(1) manual.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Jon Loeliger's ASCII art in the Tutorial.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Jon Loeliger's ASCII art in the Discussion section.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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: NJunio C Hamano <junkio@cox.net>