This merges commit
    c882bc93
from master into our head commit
    e764a10b

Sincerely,
    jit-merge command.

Allow users to create a tag message by passing message on command line
instead of requiring an $EDITOR session.
Signed-off-by: NChris Wright <chrisw@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

find_deltas() should free its temporary objects before returning.

[jc: Sergey, if you have [PATCH] title on the Subject line of your
e-mail, please do not repeat it on the first line in your message
body.  Thanks.]
Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

sha1create() and sha1fd() malloc the returned struct sha1file;
sha1close() should free it.
Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

If the object to write was packed, both its uncompressed and compressed
data were leaked.  If the object was not packed, its file was not unmapped.

[jc: I think it still leaks on the write error path of
write_sha1_to_fd(), but that should be fixable in a small separate
patch.]
Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When following a reference, read_object_with_reference() did not free the
intermediate object data.
Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

git_mkstemp() attempted to use TMPDIR environment variable, but it botched
copying the templates.

[jc: Holger, please add your own Signed-off-by line, and also if you can,
send in future patches as non attachments.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Some http servers return an HTML error page and git reads it as normal
data. Adding -f option makes curl fail silently.
Signed-off-by: NCatalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    3c4e8a63
from master into our head commit
    80f45687

Sincerely,
    jit-merge command.

Johannes Schindelin noticed that recent Makefile updates were
too eager to loosen dependencies.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Sergey Vlasov says we do not pre-require (i.e. required packages
during installation) the dependencies, and should use Requires
instead of Prereq.  Knowing nothing about RPM, I just believe
him.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

My understanding is that having my name there is just as wrong
as having name of Linus, since neither of us is a debian
maintainer, but at least this would prevent people from bugging
Linus.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Fix description and clean up the spec file.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    d59a6043
from master into our head commit
    1ff53bfd

Sincerely,
    jit-merge command.

This merges commit
    fa4da7b3
from gitk into our head commit
    6b7242aa

Sincerely,
    jit-merge command.

Now the history remembers when we have clicked on a graph line
and when we have asked for a diff between two commits, as well
as when we have displayed a commit.

The display when you click on a graph line now uses clickable
SHA1 IDs instead of the embedded "Go" buttons.  Also made the
IDs clickable in the header for a diff between two commits.

This adds a useful "Parent:" line to the git commit information window.

It looks something like this (from the infamous octopus merge):

	Author: Junio C Hamano <junkio@cox.net>  2005-05-05 16:16:54
	Committer: Junio C Hamano <junkio@cox.net>  2005-05-05 16:16:54
	Parent: fc54a9c3  (Update git-apply-patch-script ...)
	Parent: 9e30dd7c  (Make git-prune-script executa ...)
	Parent: c4b83e61  (Do not write out new index if ...)
	Parent: 66026590  (diff-cache shows differences  ...)
	Parent: b28858bf  (Update diff engine for symlin ...)

	    Octopus merge of the following five patches.

	      Update git-apply-patch-script for symbolic links.
	      Make git-prune-script executable again.
	      Do not write out new index if nothing has changed.
	      diff-cache shows differences for unmerged paths without --cache.
	      Update diff engine for symlinks stored in the cache.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

where all the parent commit ID's are clickable, because the new lines are
added as part of the "comment" string, and thus the regular clickability
thing will match them automatically.

I think this is good. And my random-tcl-monkey-skills are clearly getting
better (although it's perfectly possible that somebody who actually knows
what he is doing would have done things differently).
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

This merges commit
    6b7242aa
from master into our head commit
    f29eaed1

Sincerely,
    jit-merge command.

This merges commit
    d6e8149b
from gitk into our head commit
    200e7fbb

Sincerely,
    jit-merge command.

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

The effect of this is that it allows Tcl to do the locale-specific
conversion of the input data to its internal unicode representation.
That means that commit messages in Russian or other languages should
be displayed correctly now (according to the locale that is in effect.)

Run install-tools target to install the tools to accept e-mail
patches.  Also clean up the main Makefile a bit.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This is based on suggestions by Jeff Epler and Linus Torvalds, but
extended so that we do the switching between the watch cursor and
the normal cursor correctly as well.

Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing
the link number (duh!).

Many many thanks go to Chris Wright and H. Peter Anvin whose
help were essential to get me going this build.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    bfe19f87
from master into our head commit
    7a590132

Sincerely,
    jit-merge command.

This was triggered by a query by Sam Ravnborg, and extends "git reset" to
reset the index and the .git/HEAD pointer to an arbitrarily named point.

For example

	git reset HEAD^

will just reset the current HEAD to its own parent - leaving the working
directory untouched, but effectively un-doing the top-most commit. You
might want to do this if you realize after you committed that you made a
mistake that you want to fix up: reset your HEAD back to its previous
state, fix up the working directory and re-do the commit.

If you want to totally un-do the commit (and reset your working directory
to that point too), you'd first use "git reset HEAD^" to reset to the
parent, and then do a "git checkout -f" to reset the working directory
state to that point in time too.
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Per discussion with people interested in binary packaging,
change the default template location from /etc/git-core to
/usr/share/git-core hierarchy.  If a user wants to run git
before installing for whatever reason, in addition to adding
$src to the PATH environment variable, git-init-db can be run
with --template=$src/templates/blt/ parameter.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

This extends the source side semantics to match what Linus
suggested.

An example:

    $ git-send-pack kernel.org:/pub/scm/git/git.git pu^^:master pu

    would allow me to push the current pu into pu, and the
    commit two commits before it into master, on my public
    repository.

The revised rule for updating remote heads is as follows.

 $ git-send-pack [--all] <remote> [<ref>...]

 - When no <ref> is specified:

   - with '--all', it is the same as specifying the full refs/*
     path for all local refs;

   - without '--all', it is the same as specifying the full
     refs/* path for refs that exist on both ends;

 - When one or more <ref>s are specified:

   - a single token <ref> (i.e. no colon) must be a pattern that
     tail-matches refs/* path for an existing local ref.  It is
     an error for the pattern to match no local ref, or more
     than one local refs.  The matching ref is pushed to the
     remote end under the same name.

   - <src>:<dst> can have different cases.  <src> is first tried
     as the tail-matching pattern for refs/* path.

     - If more than one matches are found, it is an error.

     - If one match is found, <dst> must either match no remote
       ref and start with "refs/", or match exactly one remote
       ref.  That remote ref is updated with the sha1 value
       obtained from the <src> sha1.

     - If no match is found, it is given to get_extended_sha1();
       it is an error if get_extended_sha1() does not find an
       object name.  If it succeeds, <dst> must either match
       no remote ref and start with "refs/" or match exactly
       one remote ref.  That remote ref is updated with the sha1
       value.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The revised code accidentally inherited the restriction that a
reference can be pushed only once, only because the original did
not allow renaming.  This is no longer necessary so lift it.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Duh. A missing && meant that half the tests that git-sh-setup-script were
_meant_ to do were actually totally ignored.

In particular, the git sanity checking ended up only testing that the
GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was..
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This merges commit
    d698206c
from gitk into our head commit
    2c6e4771

Sincerely,
    jit-merge command.

When we display the commit message in the details pane, any string
of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we
know about gets turned into a clickable link, and displayed in
blue and underlined.

We now keep a history of commits that we have looked at, and we
have forward and back buttons for moving within the history list.

[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification.  I really appreciate
it.]
Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

If merging results in an unchanged tree, git-commit-script should not
complain that there's nothing to commit.

Also, add "[--all]" to usage().

[jc: usually there is no reason to record an unchanging merge,
but this code path is triggered only when there is a nontrivial
merge that needed to be resolved by hand, and we should be able
to record the fact that these two tree heads are dealt with as a
regular two-parent commit in order to help later merges.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This lets you run git diff in a repository otherwise read-only
to you.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

When more than two references need to be checked with
ref_newer() function, the second and later calls did not work
correctly.  This was because the later calls found commits
retained by the "struct object" layer that still had smudges
made by earlier calls.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When a new ref is being pushed, the name of it was not
terminated properly.
Signed-off-by: NJunio C Hamano <junkio@cox.net>