Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

It mistakenly failed to output anything when given a single head.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

... lest I get yelled at by a very angry scm ;-).
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The 'git bisect' command was very unforgiving in that once you made a
mistake telling it good/bad it was very hard to take it back.  Keep a
log of what you told it in an earlier session, so that it can be
replayed after removing everything after what you botched last time.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When (A,B) ==> (B,C) rename-copy was detected, we incorrectly said
that C was created by copying B.  This is because we only check if the
path of rename/copy source still exists in the resulting tree to see
if the file is renamed out of existence.  In this case, the new B is
created by copying or renaming A, so the original B is lost and we
should say C is a rename of B not a copy of B.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We now keep track of the patches merged in each branch since they have
diverged, using the records that the Arch "logs" provide. Merge parents
for a commit are defined if we are merging a series of patches that starts
from the mergebase.

If patches from a related branch are merged out-of-order, we keep track of
how much has been merged sequentially -- the tip of that sequential merge
is our new parent from that branch.

This mechanism works very well for branches that merge in dovetail and/or
flying fish patterns, probably less well for others.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Otherwise having subdirectories under refs/heads becomes rather
unwieldy.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

The --list option is what 'git branch' without parameter should
have been; it shows the one-line commit message for each branch
name.  The --independent option is used to filter out commits
that can be reachable from other commits, to make detection of
fast forward condition in multi-head merge easier.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We have deprecated the old environment variable names for quite a
while and now it's time to remove them.  Gone are:

    SHA1_FILE_DIRECTORIES AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME
    COMMIT_AUTHOR_EMAIL COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

Remove duplicate git-send-email-perl target in Makefile.

When WITH_SEND_EMAIL was defined, as in the Debian 'deb' target,
git-send-email-perl was added twice to SCRIPT_PERL, leading to a
duplicate definition in the Makefile. Creating a ".deb" then failed.
Signed-off-by: NMarco Roeland <marco.roeland@xs4all.nl>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Fix a minor typo in the tutorial.txt.
Signed-off-by: NJon Loeliger <jdl@freescale.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

There was a lingering reference to the git-*-scripts in
the tutorial.  This patch reworks that paragraph a bit.
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>

We do not say anything about checking out, so mentioning removal only
gets unnecessarily alarming.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Earlier we renamed git-foo.sh to git-foo while installing, which
was mostly done by inertia than anything else.  This however
made writing tests to use scripts harder.

This patch builds the scripts the same way as we build binaries
from their sources.  As a side effect, you can now specify
non-standard paths you have your Perl binary is in when running
the make.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This would make things easier to use for Octopus.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Fill in more missing documentation.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

git-daemon using inetd. does not work properly. inetd routes stderr onto the
network line just like stdout, which was apparently not expected to be so.

As the result of this, the stream is closed by the receiver, because some
"Packing %d objects\n" originating from pack_objects is first reported over
the line instead of the expected pack_header, and so the SIGNATURE test
fails.  Here is a workaround.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Originally from Martin Atukunda <matlads@dsmagic.com> but adjusted for
post-rename code.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

If you run `git branch --help', you will unexpectedly have created a new
branch named "--help".  This simple patch adds logic and a usage
statement to catch this and similar problems, and adds a testcase for it.
Signed-off-by: NAmos Waterland <apw@rossby.metr.ou.edu>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

 * getdomainname unavailable there.
 * needs -lsocket for linkage.
 * needs __EXTENSIONS__ at the beginning of convert-objects.c

[JC: I've done this slightly differently from what Patrick originally
sent to the list and dropped the bit that deals with installations
that has curl header and library at non-default location.  I am
resisting the slipperly slope called autoconf.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The code for listing the available subcommands was unnecessarily
complex.
Signed-off-by: NDavid Kgedal <davidk@lysator.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

More commands are documented now; thanks Raymond.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NA Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NA Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NA Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NA Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

parse-remote and rev-parse gets full documentation.  Add skeleton for
archimport.  Link them from the main git(7) page.  Also move git-daemon
and git-request-pull out of 'undocumented' section.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Also make platform specific part more isolated.  Currently we only
have Darwin defined, but I've taken a look at SunOS specific patch
(which I dropped on the floor for now) as well.  Doing things this way
would make adding it easier.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

At least we can detect what we do not handle.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

... and add a copyright notice.

[jc: also move its entry in git.txt from undocumented section.]
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This patch changes git-cvsimport-script so that it creates tag objects
instead of refs to commits, and adds an option, -u, to convert
underscores in branch and tag names to dots (since CVS doesn't allow
dots in branches and tags.)
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

... and fold it into git-clone-script.
Signed-off-by: NJunio C Hamano <junkio@cox.net>