git.git
18 years agohttp-push: avoid fork() by calling merge_bases() directly
Johannes Schindelin [Fri, 4 Aug 2006 15:50:41 +0000 (17:50 +0200)]
http-push: avoid fork() by calling merge_bases() directly

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow config file to specify Signed-off-by identity in format-patch.
Ramsay Jones [Fri, 4 Aug 2006 21:01:30 +0000 (22:01 +0100)]
Allow config file to specify Signed-off-by identity in format-patch.

Unlike git-commit, git-format-patch was not picking up and using the
user.email config variable for the email part of the committer info.
I was forced to use the GIT_COMMITTER_EMAIL environment variable to
override the default <user@localhost.localdomain>. The fix was to
simply move the call to setup_ident() to come before the git_config()
call.

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/c99'
Junio C Hamano [Fri, 4 Aug 2006 19:09:53 +0000 (12:09 -0700)]
Merge branch 'jc/c99'

* jc/c99:
  Cygwin needs NO_C99_FORMAT???

18 years agoFix crash when GIT_DIR is invalid
Johannes Schindelin [Fri, 4 Aug 2006 15:46:19 +0000 (17:46 +0200)]
Fix crash when GIT_DIR is invalid

We used to test if a pointer was NULL, and if it was, try to access it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-tar-tree: fix minor memory leak
Rene Scharfe [Fri, 4 Aug 2006 08:54:08 +0000 (10:54 +0200)]
git-tar-tree: fix minor memory leak

Free the root tree object buffer when we're done, plugging a minor leak
in generate_tar().  Note: we cannot simply free(tree.buf) because this
pointer is modified by tree_entry() calls in traverse_tree().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocument rev-list's option --merge
Uwe Zeisberger [Fri, 4 Aug 2006 08:11:15 +0000 (10:11 +0200)]
Document rev-list's option --merge

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFurther clean-up: usage() vs die()
Junio C Hamano [Fri, 4 Aug 2006 04:55:41 +0000 (21:55 -0700)]
Further clean-up: usage() vs die()

This hopefully finishes the clean-up Ramsay started with recent
commit 15e593e4d37d1d350fef20ab666d58f6881c7f5f and commit
8cdf33643dc0b21d9ea922a3fdd7f64226c421aa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReplace some calls to die(usage_str) with usage(usage_str).
Ramsay Allan Jones [Thu, 3 Aug 2006 15:48:41 +0000 (16:48 +0100)]
Replace some calls to die(usage_str) with usage(usage_str).

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFixup command names in some usage strings.
Ramsay Allan Jones [Thu, 3 Aug 2006 15:38:39 +0000 (16:38 +0100)]
Fixup command names in some usage strings.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoGIT 1.4.2-rc3 v1.4.2-rc3
Junio C Hamano [Thu, 3 Aug 2006 23:40:20 +0000 (16:40 -0700)]
GIT 1.4.2-rc3

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: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/git.txt: link git-svn and git-instaweb from the main page.
Junio C Hamano [Thu, 3 Aug 2006 23:28:24 +0000 (16:28 -0700)]
Documentation/git.txt: link git-svn and git-instaweb from the main page.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/sideband'
Junio C Hamano [Thu, 3 Aug 2006 23:02:14 +0000 (16:02 -0700)]
Merge branch 'jc/sideband'

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

18 years agosideband: do not use color, just say "remote:"
Junio C Hamano [Thu, 3 Aug 2006 23:01:58 +0000 (16:01 -0700)]
sideband: do not use color, just say "remote:"

... per suggestion by Andrew.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoShow both blob names from "git diff blob1 blob2"
Junio C Hamano [Thu, 3 Aug 2006 18:57:11 +0000 (11:57 -0700)]
Show both blob names from "git diff blob1 blob2"

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: Junio C Hamano <junkio@cox.net>
18 years agodiff.c: do not use pathname comparison to tell renames
Junio C Hamano [Thu, 3 Aug 2006 19:01:01 +0000 (12:01 -0700)]
diff.c: do not use pathname comparison to tell renames

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: Junio C Hamano <junkio@cox.net>
18 years agoAdd a couple of subdirectory tests.
Junio C Hamano [Thu, 3 Aug 2006 21:41:29 +0000 (14:41 -0700)]
Add a couple of subdirectory tests.

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: Junio C Hamano <junkio@cox.net>
18 years agoread-tree: shadowed variable fix.
Junio C Hamano [Thu, 3 Aug 2006 20:44:09 +0000 (13:44 -0700)]
read-tree: shadowed variable fix.

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: Junio C Hamano <junkio@cox.net>
18 years agofixed variable declaration in gitk
Michael [Thu, 3 Aug 2006 15:42:44 +0000 (17:42 +0200)]
fixed variable declaration in gitk

Signed-off-by: Michael <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix "git diff blob1 blob2" showing the diff in reverse.
Junio C Hamano [Thu, 3 Aug 2006 18:50:10 +0000 (11:50 -0700)]
Fix "git diff blob1 blob2" showing the diff in reverse.

This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCygwin needs NO_C99_FORMAT???
Junio C Hamano [Wed, 2 Aug 2006 22:44:07 +0000 (15:44 -0700)]
Cygwin needs NO_C99_FORMAT???

I noticed that t3800 test breaks with git built without this
option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-grep: document --and, --or, --not, ( and )
Matthias Lederhofer [Wed, 2 Aug 2006 22:04:56 +0000 (00:04 +0200)]
git-grep: document --and, --or, --not, ( and )

[jc: added an example section.]

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse declarations from builtin.h for builtin commands
Matthias Kestenholz [Wed, 2 Aug 2006 21:52:00 +0000 (23:52 +0200)]
use declarations from builtin.h for builtin commands

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-repo-config a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 21:51:59 +0000 (23:51 +0200)]
Make git-repo-config a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-prune-packed a builtin
Matthias Kestenholz [Wed, 2 Aug 2006 16:32:32 +0000 (18:32 +0200)]
Make git-prune-packed a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-annotate: remove extraneous debugging line
Jeff King [Wed, 2 Aug 2006 16:34:44 +0000 (12:34 -0400)]
git-annotate: remove extraneous debugging line

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: convert uses of git-link macro to gitlink
Jeff King [Wed, 2 Aug 2006 16:32:32 +0000 (12:32 -0400)]
Documentation: convert uses of git-link macro to gitlink

There isn't and never was such a macro; all uses are typos.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-push: remove obsolete git-push.sh
Jeff King [Wed, 2 Aug 2006 15:37:42 +0000 (11:37 -0400)]
git-push: remove obsolete git-push.sh

This was converted to a C builtin over three months ago.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-push: allow -f as an alias for --force
Jeff King [Wed, 2 Aug 2006 15:28:16 +0000 (11:28 -0400)]
git-push: allow -f as an alias for --force

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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones [Sun, 30 Jul 2006 21:42:25 +0000 (22:42 +0100)]
Remove cmd_usage() routine and re-organize the help/usage code.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix header breakage due to redefining PATH_MAX.
Ramsay Allan Jones [Sun, 30 Jul 2006 16:00:40 +0000 (17:00 +0100)]
Fix header breakage due to redefining PATH_MAX.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd NO_C99_FORMAT to support older compilers.
Ramsay Allan Jones [Sun, 30 Jul 2006 15:38:28 +0000 (16:38 +0100)]
Add NO_C99_FORMAT to support older compilers.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoNew tests and en-passant modifications to mktag.
Ramsay Allan Jones [Sat, 29 Jul 2006 17:15:47 +0000 (18:15 +0100)]
New tests and en-passant modifications to mktag.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix installation of templates on ancient systems.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:25:03 +0000 (17:25 +0100)]
Fix installation of templates on ancient systems.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix annotate test script; notice when git-annotate fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:20:41 +0000 (17:20 +0100)]
Fix annotate test script; notice when git-annotate fails.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoEnsure git-clone exits with error if perl script fails.
Ramsay Allan Jones [Sat, 29 Jul 2006 16:12:34 +0000 (17:12 +0100)]
Ensure git-clone exits with error if perl script fails.

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: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch/clone: mark messages from remote side stand out.
Junio C Hamano [Tue, 1 Aug 2006 08:34:53 +0000 (01:34 -0700)]
fetch/clone: mark messages from remote side stand out.

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: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'rs/rebase'
Junio C Hamano [Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700)]
Merge branch 'rs/rebase'

* 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.

18 years agoMerge branch 'ml/pager'
Junio C Hamano [Tue, 1 Aug 2006 06:00:51 +0000 (23:00 -0700)]
Merge branch 'ml/pager'

18 years agoMerge branch 'jc/checkout'
Junio C Hamano [Tue, 1 Aug 2006 05:59:33 +0000 (22:59 -0700)]
Merge branch 'jc/checkout'

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

18 years agopager: config variable pager.color
Matthias Lederhofer [Sat, 29 Jul 2006 22:27:43 +0000 (00:27 +0200)]
pager: config variable pager.color

enable/disable colored output when the pager is in use

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltins: control the use of pager from the command table.
Junio C Hamano [Mon, 31 Jul 2006 09:53:46 +0000 (02:53 -0700)]
Builtins: control the use of pager from the command table.

This moves the built-in "always-use-pager" logic for log family
to the command dispatch table of git wrapper.  This makes it
easier to change the default use of pager, and has an added
benefit that we fork and exec the pager early before packs are
mmapped.

Pointed out by Juergen Ruehle <j.ruehle@bmiag.de>.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix up some fallout from "setup_git_directory()" cleanups
Linus Torvalds [Mon, 31 Jul 2006 20:13:55 +0000 (13:13 -0700)]
Fix up some fallout from "setup_git_directory()" cleanups

git-ls-files was broken by the setup_git_directory() calling changes,
because I had missed the fact that the "prefix" variable in that file was
static to the whole file, and unlike git-ls-tree (where I had fixed it
up), it ended up using two different variables with the same name
depending on what the scoping happened to be.

This fixes it up properly (by just removing the static variable, and
passing the automatic one around properly), and git-ls-files should work
again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix double "close()" in ce_compare_data
Linus Torvalds [Mon, 31 Jul 2006 16:55:15 +0000 (09:55 -0700)]
Fix double "close()" in ce_compare_data

Doing an "strace" on "git diff" shows that we close() a file descriptor
twice (getting EBADFD on the second one) when we end up in ce_compare_data
if the index does not match the checked-out stat information.

The "index_fd()" function will already have closed the fd for us, so we
should not close it again.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-checkout: allow "checkout HEAD -- path"
Junio C Hamano [Mon, 31 Jul 2006 10:07:12 +0000 (03:07 -0700)]
git-checkout: allow "checkout HEAD -- path"

Even though -- is redundant in this case, we should allow it to prevent
confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: Make the fast-fowarding message more user-friendly by using branch names...
Robert Shearman [Thu, 27 Jul 2006 09:32:46 +0000 (10:32 +0100)]
rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: Fix the detection of fast-forwarding of the current branch to upstream.
Robert Shearman [Thu, 27 Jul 2006 09:32:25 +0000 (10:32 +0100)]
rebase: Fix the detection of fast-forwarding of the current branch to upstream.

Previously, a rebasing operation with on a branch that is just tracking
an upstream branch would output a confusing "Nothing to do" due to no
patches being given to git-am.

The test brings the behaviour back into line with that of just before
e646c9c8c0aa995eac284ea0a2117add19c4461c.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: illustrate an obscure feature better
Johannes Schindelin [Mon, 31 Jul 2006 00:26:27 +0000 (02:26 +0200)]
tar-tree: illustrate an obscure feature better

Since you can tar just a subdirectory of a certain revision, tell
the users so, by showing an example how to do it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.c: allow alias expansion without a git directory
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (03:30 +0200)]
git.c: allow alias expansion without a git directory

With this, the configuration mechanism can be used to say:

[alias]
init = init-db --template=/path/to/template

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosetup_git_directory_gently: do not barf when GIT_DIR is given.
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (03:30 +0200)]
setup_git_directory_gently: do not barf when GIT_DIR is given.

Earlier we barfed when GIT_DIR environment variable points at a
directory yet to be created, which made it impossible to use
configuration mechanism in "git-init-db".

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuild on Debian GNU/kFreeBSD
Gerrit Pape [Sat, 29 Jul 2006 16:26:18 +0000 (16:26 +0000)]
Build on Debian GNU/kFreeBSD

Patch from Petr Salinger to make the build process detect and support the
Debian GNU/kFreeBSD architecture, see
 http://bugs.debian.org/380209

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/web'
Junio C Hamano [Sun, 30 Jul 2006 20:35:08 +0000 (13:35 -0700)]
Merge branch 'lt/web'

* lt/web:
  gitweb.cgi: git_blame2: slight optimization reading the blame lines
  gitweb.cgi: git_blame2: Revision blocks now have alternating colors
  gitweb.cgi: git_blame2: Allow back-trekking through commits
  gitweb.cgi: git_blame2: an alternative simple working git blame

18 years agoMerge branch '__/setup-n-mv'
Junio C Hamano [Sun, 30 Jul 2006 20:34:52 +0000 (13:34 -0700)]
Merge branch '__/setup-n-mv'

* __/setup-n-mv:
  Call setup_git_directory() much earlier
  Call setup_git_directory() early

18 years agoMerge branch 'js/mv'
Junio C Hamano [Sun, 30 Jul 2006 20:24:48 +0000 (13:24 -0700)]
Merge branch 'js/mv'

* js/mv:
  builtin git-mv: support moving directories
  Make git-mv a builtin
  Extract helper bits from c-merge-recursive work

18 years agoMerge branch 'jn/make'
Junio C Hamano [Sun, 30 Jul 2006 20:24:29 +0000 (13:24 -0700)]
Merge branch 'jn/make'

* jn/make:
  Set datarootdir in config.mak.in
  Quote all calls to GIT_CONF_APPEND_LINE
  Typofix in configure.ac comment.
  configure.ac vertical whitespace usage cleanup
  autoconf: Checks for some programs
  autoconf: Checks for libraries
  autoconf: Checks for some library functions.
  autoconf: Checks for typedefs, structures, and compiler characteristics.
  autoconf: Preparing the way for autodetection
  Copy description of build configuration variables to configure.ac
  Teach make clean about configure and autoconf
  autoconf: Use autoconf to write installation directories to config.mak.autogen

18 years agoMerge branch 'lt/setup' into __/setup-n-mv
Junio C Hamano [Sat, 29 Jul 2006 08:54:54 +0000 (01:54 -0700)]
Merge branch 'lt/setup' into __/setup-n-mv

This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCall setup_git_directory() much earlier
Linus Torvalds [Sat, 29 Jul 2006 05:44:25 +0000 (22:44 -0700)]
Call setup_git_directory() much earlier

This changes the calling convention of built-in commands and
passes the "prefix" (i.e. pathname of $PWD relative to the
project root level) down to them.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCall setup_git_directory() early
Linus Torvalds [Sat, 29 Jul 2006 04:21:48 +0000 (21:21 -0700)]
Call setup_git_directory() early

Any git command that expects to work in a subdirectory of a project, and
that reads the git config files (which is just about all of them) needs to
make sure that it does the "setup_git_directory()" call before it tries to
read the config file.

This means, among other things, that we need to move the call out of
"init_revisions()", and into the caller.

This does the mostly trivial conversion to do that.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDisplay an error from update-ref if target ref name is invalid.
Shawn Pearce [Sat, 29 Jul 2006 03:44:51 +0000 (23:44 -0400)]
Display an error from update-ref if target ref name is invalid.

Alex Riesen (raa.lkml@gmail.com) recently observed that git branch
would fail with no error message due to unexpected situations with
regards to refs.  For example, if .git/refs/heads/gu is a file but
"git branch -b refs/heads/gu/fixa HEAD" was invoked by the user
it would fail silently due to refs/heads/gu being a file and not
a directory.

This change adds a test for trying to create a ref within a directory
that is actually currently a file, and adds error printing within
the ref locking routine should the resolve operation fail.

The error printing code probably belongs at this level of the library
as other failures within the ref locking, writing and logging code
are also currently at this level of the code.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix http-fetch
Johannes Schindelin [Sat, 29 Jul 2006 00:10:07 +0000 (02:10 +0200)]
Fix http-fetch

With the latest changes in fetch.c, http-fetch crashed accessing
write_ref[i], where write_ref was NULL.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/multi-fetch'
Junio C Hamano [Fri, 28 Jul 2006 20:25:20 +0000 (13:25 -0700)]
Merge branch 'pb/multi-fetch'

* pb/multi-fetch:
  Teach git-http-fetch the --stdin switch
  Teach git-local-fetch the --stdin switch
  Make pull() support fetching multiple targets at once
  Make pull() take some implicit data as explicit arguments

18 years agoMerge branch 'lt/web'
Junio C Hamano [Fri, 28 Jul 2006 20:19:38 +0000 (13:19 -0700)]
Merge branch 'lt/web'

18 years agoMerge branch 'js/cvs'
Junio C Hamano [Fri, 28 Jul 2006 20:18:19 +0000 (13:18 -0700)]
Merge branch 'js/cvs'

* js/cvs:
  cvsserver: imitate git-update-ref when committing

18 years agoMerge branch 'js/alias-p'
Junio C Hamano [Fri, 28 Jul 2006 19:33:57 +0000 (12:33 -0700)]
Merge branch 'js/alias-p'

* js/alias-p:
  git wrapper: add --git-dir=<path> and --bare options
  Allow an alias to start with "-p"

18 years agoMerge branch 'jc/diff'
Junio C Hamano [Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700)]
Merge branch 'jc/diff'

* jc/diff:
  git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"

18 years agot4103: fix binary patch application test.
Junio C Hamano [Fri, 28 Jul 2006 19:23:28 +0000 (12:23 -0700)]
t4103: fix binary patch application test.

The generated binary patch was _not_ binary -- earlier I made
the --full-index flag to imply binary patch generation to the diff
machinery, but later we made it independent from --binary (although
the latter implies the former).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply -R: binary patches are irreversible for now.
Junio C Hamano [Fri, 28 Jul 2006 19:21:17 +0000 (12:21 -0700)]
git-apply -R: binary patches are irreversible for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-apply about '-R'
Johannes Schindelin [Fri, 28 Jul 2006 15:46:11 +0000 (17:46 +0200)]
Teach git-apply about '-R'

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: ssh-pull.o depends on ssh-fetch.c
Johannes Schindelin [Fri, 28 Jul 2006 09:17:46 +0000 (11:17 +0200)]
Makefile: ssh-pull.o depends on ssh-fetch.c

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolog and diff family: honor config even from subdirectories
Junio C Hamano [Fri, 28 Jul 2006 05:55:44 +0000 (22:55 -0700)]
log and diff family: honor config even from subdirectories

There currently is an unfortunate circular dependency between
what init_revisions (the command line revision specification
parser) does and setting up the log and diff options.  The
function uses setup_git_directory() to find the root of the
project relative to the current directory and calls diff_setup()
to prepare diff generation.  However, some of the things that
diff_setup() does needs to depend on the configuration variable,
which needs to be read after setup_git_directory() is called.

This patch is a low impact workaround.  It first lets
init_revisions() to run and do its thing, then uses git_config()
and diff_setup() after it returns, so that configuration
variables that affects the diff operation can be used from
subdirectories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-reset: detect update-ref error and report it.
Junio C Hamano [Fri, 28 Jul 2006 05:27:44 +0000 (22:27 -0700)]
git-reset: detect update-ref error and report it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolost-found: use fsck-objects --full
Junio C Hamano [Fri, 28 Jul 2006 05:15:01 +0000 (22:15 -0700)]
lost-found: use fsck-objects --full

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-http-fetch the --stdin switch
Petr Baudis [Thu, 27 Jul 2006 21:56:22 +0000 (23:56 +0200)]
Teach git-http-fetch the --stdin switch

Speeds up things quite a lot when fetching tags with Cogito.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-local-fetch the --stdin switch
Petr Baudis [Thu, 27 Jul 2006 21:56:19 +0000 (23:56 +0200)]
Teach git-local-fetch the --stdin switch

This makes it possible to fetch many commits (refs) at once, greatly
speeding up cg-clone.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pull() support fetching multiple targets at once
Petr Baudis [Thu, 27 Jul 2006 21:56:17 +0000 (23:56 +0200)]
Make pull() support fetching multiple targets at once

pull() now takes an array of arguments instead of just one of each kind.
Currently, no users use the new capability, but that'll change.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pull() take some implicit data as explicit arguments
Petr Baudis [Thu, 27 Jul 2006 21:56:14 +0000 (23:56 +0200)]
Make pull() take some implicit data as explicit arguments

Currently it's a bit weird that pull() takes a single argument
describing the commit but takes the write_ref from a global variable.
This makes it take that as a parameter as well, which might be nicer
for the libification in the future, but especially it will make for
nicer code when we implement pull()ing multiple commits at once.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomailinfo: accept >From in message header
Michael S. Tsirkin [Thu, 27 Jul 2006 14:03:43 +0000 (17:03 +0300)]
mailinfo: accept >From in message header

Mail I get sometimes has multiple From lines, like this:

    From Majordomo@vger.kernel.org  Thu Jul 27 16:39:36 2006
    >From mtsirkin  Thu Jul 27 16:39:36 2006
    Received: from yok.mtl.com [10.0.8.11]
    ...

which confuses git-mailinfo since that does not recognize >From
as a valid header line.

This patch makes it recognize >From XXX as a valid header line.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove -d from *-fetch usage strings
Petr Baudis [Thu, 27 Jul 2006 18:58:53 +0000 (20:58 +0200)]
Remove -d from *-fetch usage strings

This is a really ancient remnant of the short era of delta objects stored
directly in the object database.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: documentation for --reuseaddr, --detach and --pid-file
Matthias Lederhofer [Fri, 14 Jul 2006 15:53:29 +0000 (17:53 +0200)]
daemon: documentation for --reuseaddr, --detach and --pid-file

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: imitate git-update-ref when committing
Johannes Schindelin [Wed, 26 Jul 2006 20:51:52 +0000 (22:51 +0200)]
cvsserver: imitate git-update-ref when committing

git-update-ref writes into the lockfile, and renames it afterwards. Like
commit v1.3.0-rc3~22, it is not only cleaner, but also helps with shared
setups: every developer can have a different primary group; what matters
is that $GIT_DIR/refs/heads has to be writable by a group you are in.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoinstaweb: Be more clear if httpd or the browser fail
Johannes Schindelin [Wed, 26 Jul 2006 21:11:46 +0000 (23:11 +0200)]
instaweb: Be more clear if httpd or the browser fail

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin git-mv: support moving directories
Johannes Schindelin [Wed, 26 Jul 2006 17:47:54 +0000 (19:47 +0200)]
builtin git-mv: support moving directories

This fixes the builtin mv for the test which Josef provided, and also
fixes moving directories into existing directories, as noted by Jon Smirl.
In case the destination exists, fail early (this cannot be overridden
by -f).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-mv a builtin
Johannes Schindelin [Wed, 26 Jul 2006 01:52:35 +0000 (03:52 +0200)]
Make git-mv a builtin

This also moves add_file_to_index() to read-cache.c. Oh, and while
touching builtin-add.c, it also removes a duplicate git_config() call.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoExtract helper bits from c-merge-recursive work
Johannes Schindelin [Wed, 26 Jul 2006 04:32:18 +0000 (21:32 -0700)]
Extract helper bits from c-merge-recursive work

This backports the pieces that are not uncooked from the merge-recursive
WIP we have seen earlier, to be used in git-mv rewritten in C.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/configure'
Junio C Hamano [Wed, 26 Jul 2006 20:35:35 +0000 (13:35 -0700)]
Merge branch 'pb/configure'

* pb/configure:
  Rename man1 and man7 variables to man1dir and man7dir
  Allow INSTALL, bindir, mandir to be set in main Makefile

18 years agogit-cvsserver: support multiline commit messages
Johannes Schindelin [Wed, 26 Jul 2006 19:59:08 +0000 (21:59 +0200)]
git-cvsserver: support multiline commit messages

Earlier, cvsserver barfed when you tried to check in files with a
multiline commit message.

That is what Argumentx is for... Argument: lines can be followed by
several Argumentx: lines, which means they should be appended.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot7001: add test for git-mv dir1 dir2/
Johannes Schindelin [Wed, 26 Jul 2006 17:41:05 +0000 (19:41 +0200)]
t7001: add test for git-mv dir1 dir2/

If dir2 already exists, git-mv should move dir1 _into_dir2/.
Noticed by Jon Smirl.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix two warnings
Johannes Schindelin [Wed, 26 Jul 2006 14:58:35 +0000 (16:58 +0200)]
gitweb: fix two warnings

These warnings cluttered up my log.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: respect bindir from Makefile
Johannes Schindelin [Wed, 26 Jul 2006 14:32:51 +0000 (16:32 +0200)]
git-instaweb: respect bindir from Makefile

Not everybody installs git to /usr/bin/git.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: some Apache have mod_cgi builtin
Johannes Schindelin [Wed, 26 Jul 2006 14:33:18 +0000 (16:33 +0200)]
git-instaweb: some Apache have mod_cgi builtin

So test for it, and do not always try to load mod_cgi.o.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4112: simplify the test and remove unneeded working tree file.
Junio C Hamano [Wed, 26 Jul 2006 18:01:07 +0000 (11:01 -0700)]
t4112: simplify the test and remove unneeded working tree file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoExtend testing git-mv for renaming of subdirectories
Josef Weidendorfer [Wed, 26 Jul 2006 13:44:08 +0000 (15:44 +0200)]
Extend testing git-mv for renaming of subdirectories

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit wrapper: add --git-dir=<path> and --bare options
Johannes Schindelin [Tue, 25 Jul 2006 18:24:22 +0000 (20:24 +0200)]
git wrapper: add --git-dir=<path> and --bare options

With this, you can say

git --bare repack -a -d

inside a bare repository, and it will actually work. While at it,
also move the --version, --help and --exec-path options to the
handle_options() function.

While at documenting the new options, also document the --paginate
option.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow an alias to start with "-p"
Johannes Schindelin [Mon, 24 Jul 2006 12:10:45 +0000 (14:10 +0200)]
Allow an alias to start with "-p"

Now, something like

[alias]
pd = -p diff

works as expected.

[jc: a follow-up fix from Jeff King folded in.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: avoid warning about active db handles v1.4.2-rc2
Johannes Schindelin [Tue, 25 Jul 2006 11:57:57 +0000 (13:57 +0200)]
cvsserver: avoid warning about active db handles

Turns out that DBD::SQLite does not favour preparing statements which are
never executed. So, turn all 4 statements, which were prepared _always_,
into methods, like the other 12 prepared statements.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: suppress warnings
Johannes Schindelin [Tue, 25 Jul 2006 10:48:52 +0000 (12:48 +0200)]
cvsserver: suppress warnings

This patch defines $state->{prependdir} as the empty string, so that
quite a few warnings are avoided.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubstitute xmalloc()+memset(0) with xcalloc().
Peter Eriksen [Tue, 25 Jul 2006 07:30:18 +0000 (09:30 +0200)]
Substitute xmalloc()+memset(0) with xcalloc().

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: escape tag comments
Daniel Drake [Mon, 24 Jul 2006 22:07:23 +0000 (23:07 +0100)]
gitweb: escape tag comments

I have a tag with a comment which includes an & character. Firefox wouldn't
display my gitweb summary page due to malformed XML. This solves the problem.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/clone-bind-failure'
Junio C Hamano [Tue, 25 Jul 2006 20:19:54 +0000 (13:19 -0700)]
Merge branch 'jc/clone-bind-failure'

* jc/clone-bind-failure:
  fetch/clone: check return status from ls-remote

18 years agoMerge branch 'jt/format-patch'
Junio C Hamano [Tue, 25 Jul 2006 19:54:57 +0000 (12:54 -0700)]
Merge branch 'jt/format-patch'

* jt/format-patch:
  builtin-log: typefix for recent format-patch changes.
  Add option to set initial In-Reply-To/References
  Add option to enable threading headers
  git-format-patch: Make the second and subsequent mails replies to the first

18 years agoMerge branch 'ew/apply'
Junio C Hamano [Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)]
Merge branch 'ew/apply'

* ew/apply:
  Fix t4114 on cygwin
  apply: handle type-changing patch correctly.
  apply: split out removal and creation into different phases.
  apply: check D/F conflicts more carefully.
  typechange tests for git apply (currently failing)