As Matthias Kestenholz noted, the flag does not quite mean
"needs prefix" -- it is more like "run setup_git_directory()
before running this command", so rename it to avoid future
confusion.

While we are at it, rewrite the definition of options to make it
obvious that we are talking about flag bits by using standard (1<<n)
notation.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This cleans up the build procedure for built-in commands by:

 - generating mostly redundant definition of BUILT_INS from
   BUILTIN_OBJS in the Makefile,
 - renaming a few files to make the above possible, and
 - sorting the built-in command table in git.c.

It might be a good idea to binary search (or perfect hash) the built-in
command table, but that can be done later when somebody feels like.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This hopefully finishes the clean-up Ramsay started with recent
commit 15e593e4 and commit
8cdf3364.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The only change in behaviour should be having a "usage: " prefix
on the output string rather than "fatal: ", and an exit code of
129 rather than 128.
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Most usage strings, such as for command xxx, start with "git-xxx".
This updates the rebels to conform to the general pattern.
(The git wrapper is an exception to this, of course ...)
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We ended up merging too many stuff after -rc2, so here is
another round of release candidate.  Non bugfixes will be
queued to "next" from now on until a real 1.4.2 happens.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

* jc/sideband:
  sideband: do not use color, just say "remote:"
  fetch/clone: mark messages from remote side stand out.

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

Earlier we deliberately showed only blob1's name because showing
both names labeled the output as a renaming patch.  Now the output
routine (namely, diff.c::resolve_rename_copy()) is taught not to
use pathname comparison to tell if a filepair is a rename, we can
safely do this change.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The final output from diff used to compare pathnames between
preimage and postimage to tell if the filepair is a rename/copy.
By explicitly marking the filepair created by diffcore_rename(),
the output routine, resolve_rename_copy(), does not have to do
so anymore.  This helps feeding a filepair that has different
pathnames in one and two elements to the diff machinery (most
notably, comparing two blobs).
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We still have too few of them, but we have to start from somewhere.
The general rule is to make tests easy to debug when run with -v (notice
use of seemingly useless echo everywhere in the new tests).
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Recent changes to built-ins broke committing from subdirectory,
because the unused parameter "prefix" shadowed a global variable.

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

Signed-off-by: NMichael <barra_cuda@katamail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

[jc: added an example section.]
Signed-off-by: NMatthias Lederhofer <matled@gmx.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

There isn't and never was such a macro; all uses are typos.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This was converted to a C builtin over three months ago.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This was already documented in the options section of the manpage. This
patch implements it, adds it to the usage message, and mentions it at the
top of the manpage.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The cmd_usage() routine was causing warning messages due to a NULL
format parameter being passed in three out of four calls. This is a
problem if you want to compile with -Werror. A simple solution is to
simply remove the GNU __attribute__ format pragma from the cmd_usage()
declaration in the header file. The function interface was somewhat
muddled anyway, so re-write the code to finesse the problem.

[jc: this incidentally revealed that t9100 test assumed that the output
 from "git help" to be fixed in stone, but this patch lower-cases
 "Usage" to "usage".  Update the test not to rely on "git help" output.]
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The header builtin.h was, incorrectly, redefining PATH_MAX which
causes a header order dependency in builtin-write-tree.c.  The fix
is to simply include <limits.h> directly to obtain the correct
definition of PATH_MAX.
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The NO_C99_FORMAT macro allows compilers that lack support for the
ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
runtime errors in the formatted IO functions.
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

These changes were originally part of the next patch, but have been
split out since they were peripheral to the main purpose of that patch.

  - update comment describing the signature format to reflect
    the current code.
  - remove trailing \n in calls to error(), since a \n is already
    provided by error().
  - remove redundant call to get_sha1_hex().
  - call sha1_to_hex(sha1) to convert to ascii, rather than attempting
    to print the raw sha1.

The new tests provide a regression suite to support the modifications
to git-mktag in this and the next patch.
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.

[jc: we have fixed the main Makefile long time ago, but somehow
 forgot to apply the same fix to templates Makefile.]
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The t8001-annotate.sh test claimed all tests pass, when in fact
the git-annotate perl script failed to run! (prior to fixing the
script to work with perl 5.5).
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This helps tests 5400,5600,5700,5710 "fail correctly" rather than
give some false positives.  Also ensure cleanup actions in exit trap
work correctly even if user has alias rm='rm -i'.
Signed-off-by: NRamsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When dealing with a corrupt or out of sync remote repository,
the user often gets error messages like this:

	error: refs/heads/devel does not point to a valid commit object!

which leaves the user wondering if the breakage is on the local
end or on the remote end.  This is unnecessarily alarming.

This patch changes the way we display messages received from the
remote side over the git protocol sideband (i.e. stderr stream
of the remote process).  It shows them with blue background with
white letters, but this presentation is subject to proposals of
better ways from the list.

The problem was pointed out by Andrew Morton.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* rs/rebase:
  rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
  rebase: Fix the detection of fast-forwarding of the current branch to upstream.

* jc/checkout:
  git-checkout: allow "checkout HEAD -- path"

enable/disable colored output when the pager is in use
Signed-off-by: NMatthias Lederhofer <matled@gmx.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>