Code

git.git
19 years agogit-am: do not fail if 3-way fallback succeeds.
Junio C Hamano [Thu, 13 Oct 2005 18:46:43 +0000 (11:46 -0700)]
git-am: do not fail if 3-way fallback succeeds.

The current one incorrectly stops there without committing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd findtags - reworked
Martin Langhoff [Thu, 13 Oct 2005 17:47:42 +0000 (10:47 -0700)]
Add findtags - reworked

A short perl script that will walk the tag refs, tag objects, and even commit
objects in its quest to figure out whether the given SHA1 (for a commit or
tree) was ever tagged.

This version is reworked incorporating sanity, feature and style fixes from
Junio.

Usage: git-findtags.perl [ -t ] <commit-or-tree-sha1>

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRevert "Also use 'track_object_refs = 0' in update-server-info."
Sergey Vlasov [Thu, 13 Oct 2005 17:01:57 +0000 (10:01 -0700)]
Revert "Also use 'track_object_refs = 0' in update-server-info."

This reverts d119e3de13ea1493107bd57381d0ce9c9dd90976 commit.

Object references are used in server-info.c:find_pack_info_one() to
find out which objects in the pack are heads, therefore tracking of
references cannot be disabled.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoclone-pack: new option --keep tells it not to explode the pack.
Junio C Hamano [Thu, 13 Oct 2005 01:12:27 +0000 (18:12 -0700)]
clone-pack: new option --keep tells it not to explode the pack.

With new option --keep, or a configuration item clone.keeppack (we
need a better name, or start allowing dash,"clone.keep-pack"), the packed
data downloaded while cloning is saved as a pack in .git/objects/pack/
locally, with index generated for it with git-index-pack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoclone-pack: new option --keep tells it not to explode the pack.
Junio C Hamano [Thu, 13 Oct 2005 01:12:27 +0000 (18:12 -0700)]
clone-pack: new option --keep tells it not to explode the pack.

With new option --keep, or a configuration item clone.keeppack (we
need a better name, or start allowing dash,"clone.keep-pack"), the packed
data downloaded while cloning is saved as a pack in .git/objects/pack/
locally, with index generated for it with git-index-pack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix packname hash generation.
Junio C Hamano [Wed, 12 Oct 2005 23:54:19 +0000 (16:54 -0700)]
Fix packname hash generation.

This changes the generation of hash packfiles have in their names, from
"hash of object names as fed to us" to "hash of object names in the
resulting pack, in the order they appear in the index file".  The new
"git-index-pack" command is taught to output the computed hash value
to its standard output.

With this, we can store downloaded pack in a temporary file without
knowing its final name, run git-index-pack to generate idx for it
while finding out its final name, and then rename the pack and idx to
their final names.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd git-index-pack utility
Sergey Vlasov [Wed, 12 Oct 2005 19:01:31 +0000 (12:01 -0700)]
Add git-index-pack utility

git-index-pack builds a pack index file for an existing packed
archive.  With this utility a packed archive which was transferred
without the corresponding pack index can be added to objects/pack/
without repacking.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-am: interactive should fail gracefully.
Junio C Hamano [Thu, 13 Oct 2005 01:31:41 +0000 (18:31 -0700)]
git-am: interactive should fail gracefully.

When feeding patches from standard input, and --interactive is specified,
quit, so that the user can re-run the command, instead of infinitely
looping.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-fetch --tags: deal with tags with spaces in them.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
git-fetch --tags: deal with tags with spaces in them.

"git-fetch --tags" can get confused with tags with spaces in their names,
it used to use shell IFS to split the list of tags and also used curl
which insists the URL to be escaped.  Fix it so it can work with Martin's
moodle repository http://locke.catalyst.net.nz/git/moodle.git/.

We still reserve characters like leading plus-sign '+' and colon
':' anywhere to represent refspec src-dst pair, and obviously we
cannot use LF (that terminates Pull: line in .git/remotes
files), but now you can have spaces with this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoQuote reference names while fetching with curl.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
Quote reference names while fetching with curl.

curl_escape ought to do this, but we should not let it quote
slashes (nobody said refs/tags cannot have subdirectories), so
we roll our own safer version.  With this, the last part of
git-clone from Martin's moodle repository that used to fail now
works, which reads:

 $ git-http-fetch -v -a -w 'tags/MOODLE_15_MERGED **INVALID**' \
   'tags/MOODLE_15_MERGED **INVALID**' \
   http://locke.catalyst.net.nz/git/moodle.git/

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 12 Oct 2005 05:04:11 +0000 (22:04 -0700)]
Merge branch 'fixes'

19 years ago[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
Martin Langhoff [Wed, 12 Oct 2005 04:57:04 +0000 (21:57 -0700)]
[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us

Detecting if the user passed --no-cvs-direct and don't force the mode.
It allows us to support all the protocol that the standard cvs client
supports at the snail speed you should expect.

This only affects the rlog reading stage.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
19 years agoMake git config variable names case-insensitive
Linus Torvalds [Wed, 12 Oct 2005 01:47:34 +0000 (18:47 -0700)]
Make git config variable names case-insensitive

They always were meant to be case-insensitive, but I had missed one
"tolower()", making that not true.

The actual _values_ aren't case-insensitive, of course, although some uses
of them may be (ie boolean parsing uses "strcasecmp()" to match against
the strings "true" and "false").

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse git config file for committer name and email info
Linus Torvalds [Wed, 12 Oct 2005 01:47:34 +0000 (18:47 -0700)]
Use git config file for committer name and email info

This starts using the "user.name" and "user.email" config variables if
they exist as the default name and email when committing.  This means
that you don't have to use the GIT_COMMITTER_EMAIL environment variable
to override your email - you can just edit the config file instead.

The patch looks bigger than it is because it makes the default name and
email information non-static and renames it appropriately.  And it moves
the common git environment variables into a new library file, so that
you can link against libgit.a and get the git environment without having
to link in zlib and libcrypt.

In short, most of it is renaming and moving, the real change core is
just a few new lines in "git_default_config()" that copies the user
config values to the new base.

It also changes "git-var -l" to list the config variables.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoExport template_dir in Makefile.
Tom Prince [Wed, 12 Oct 2005 01:47:33 +0000 (18:47 -0700)]
Export template_dir in Makefile.

If somebody set template_dir in config.mak. Then git-init-db would be
compiled with the correct location but the templates would be installed
in the default location. Fix it.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse core.filemode.
Junio C Hamano [Wed, 12 Oct 2005 01:45:33 +0000 (18:45 -0700)]
Use core.filemode.

With "[core] filemode = false", you can tell git to ignore
differences in the working tree file only in executable bit.

 * "git-update-index --refresh" does not say "needs update" if index
   entry and working tree file differs only in executable bit.

 * "git-update-index" on an existing path takes executable bit
   from the existing index entry, if the path and index entry are
   both regular files.

 * "git-diff-files" and "git-diff-index" without --cached flag
   pretend the path on the filesystem has the same executable
   bit as the existing index entry, if the path and index entry
   are both regular files.

If you are on a filesystem with unreliable mode bits, you may need to
force the executable bit after registering the path in the index.

 * "git-update-index --chmod=+x foo" flips the executable bit of the
   index file entry for path "foo" on.  Use "--chmod=-x" to flip it
   off.

Note that --chmod only works in index file and does not look at nor
update the working tree.

So if you are on a filesystem and do not have working executable bit,
you would do:

 1. set the appropriate .git/config option;

 2. "git-update-index --add new-file.c"

 3. "git-ls-files --stage new-file.c" to see if it has the desired
   mode bits.  If not, e.g. to drop executable bit picked up from the
   filesystem, say "git-update-index --chmod=-x new-file.c".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoImprove config file escape sanity checking
Linus Torvalds [Tue, 11 Oct 2005 22:24:11 +0000 (15:24 -0700)]
Improve config file escape sanity checking

I had meant to disallow unknown escape characters in the config file
parser, but instead an unknown escaped character would silently pass
through as itself. That's correct for some cases (notably '\' itself), but
wasn't correct in general.

This fixes it, and makes the parser write a nice error message if the
config file contains bogus escaped characters.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoshow-branch: optionally use unique prefix as name.
Junio C Hamano [Tue, 11 Oct 2005 22:22:48 +0000 (15:22 -0700)]
show-branch: optionally use unique prefix as name.

git-show-branch acquires two new options. --sha1-name to name
commits using the unique prefix of their object names, and
--no-name to not to show names at all.

This was outlined in <7vk6gpyuyr.fsf@assigned-by-dhcp.cox.net>

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSupport custom build options in config.mak
Johannes Schindelin [Tue, 11 Oct 2005 22:22:47 +0000 (15:22 -0700)]
Support custom build options in config.mak

With this patch, it is possible to store configuration options like
NO_CURL=YesPlease or NO_OPENSSL=YesPlease into a file named
config.mak, which will be included in the Makefile.

[jc: redone with suggestion from Daniel Barkalow to just use -include]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse git-update-ref and git-symbolic-ref in tests
Johannes Schindelin [Tue, 11 Oct 2005 22:15:15 +0000 (15:15 -0700)]
Use git-update-ref and git-symbolic-ref in tests

This makes all tests pass on cygwin.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove unused 'got_alternates' variable.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
Remove unused 'got_alternates' variable.

The function fetch_alternates() is called only once from the
main now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse the same move_temp_to_file in git-http-fetch.
Junio C Hamano [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Use the same move_temp_to_file in git-http-fetch.

The http commit walker cannot use the same temporary file
creation code because it needs to use predictable temporary
filename for partial fetch continuation purposes, but the code
to move the temporary file to the final location should be
usable from the ordinary object creation codepath.

Export move_temp_to_file from sha1_file.c and use it, while
losing the custom relink_or_rename function from http-fetch.c.

Also the temporary object file creation part needs to make sure
the leading path exists, in preparation of the really lazy
fan-out directory creation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRestore functionality to allow proxies to cache objects
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Restore functionality to allow proxies to cache objects

The parallel request changes didn't properly implement the previous patch to
allow caching of retrieved objects by proxy servers.  Restore the previous
functionality such that by default requests include the "Pragma: no-cache"
header, and this header is removed on requests for pack indexes, packs, and
objects.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Don't fetch objects that exist in the local repository
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
[PATCH] Don't fetch objects that exist in the local repository

Be sure not to fetch objects that already exist in the local repository.
The main process loop no longer performs this check, http-fetch now checks
prior to starting a new request queue entry and when fetch_object() is called,
and local-fetch now checks when fetch_object() is called.

As discussed in this thread: http://marc.theaimsgroup.com/?t=112854890500001

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
19 years agoSet the parallel HTTP request limit via an environment variable
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Set the parallel HTTP request limit via an environment variable

Use an environment variable rather than a command-line argument to set the
parallel HTTP request limit.  This allows the setting to work whether
git-http-fetch is run directly or via git-fetch.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoOnly compile parallel HTTP support with CURL >= 7.9.8
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Only compile parallel HTTP support with CURL >= 7.9.8

Only compile parallel HTTP support with CURL >= 7.9.8

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd support for parallel HTTP transfers
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Add support for parallel HTTP transfers

Add support for parallel HTTP transfers.  Prefetch populates a queue of
objects to transfer and starts feeding requests to an active request
queue for processing; fetch_object keeps the active queue moving
while the specified object is being transferred.  The size of the active
queue can be restricted using -r and defaults to 5 concurrent transfers.
Requests for objects that are not prefetched are also processed via the
active queue.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove empty directories after read-tree -u.
Junio C Hamano [Tue, 11 Oct 2005 00:34:08 +0000 (17:34 -0700)]
Remove empty directories after read-tree -u.

This fixes everybody's favorite gripe that switching branche with
'git checkout' leaves empty directories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd ".git/config" file parser
Linus Torvalds [Mon, 10 Oct 2005 23:31:08 +0000 (16:31 -0700)]
Add ".git/config" file parser

This is a first cut at a very simple parser for a git config file.

The format of the file is a simple ini-file like thing, with simple
variable/value pairs. You can (and should) make the variables have a
simple single-level scope, ie a valid file looks something like this:

#
# This is the config file, and
# a '#' or ';' character indicates
# a comment
#

; core variables
[core]
; Don't trust file modes
filemode = false

; Our diff algorithm
[diff]
external = "/usr/local/bin/gnu-diff -u"
renames = true

which parses into three variables: "core.filemode" is associated with the
string "false", and "diff.external" gets the appropriate quoted value.

Right now we only react to one variable: "core.filemode" is a boolean that
decides if we should care about the 0100 (user-execute) bit of the stat
information. Even that is just a parsing demonstration - this doesn't
actually implement that st_mode compare logic itself.

Different programs can react to different config options, although they
should always fall back to calling "git_default_config()" on any config
option name that they don't recognize.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Mon, 10 Oct 2005 23:03:43 +0000 (16:03 -0700)]
Merge branch 'fixes'

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoThe synopsis of the manpages should use the hyphenated version
Christian Meder [Mon, 10 Oct 2005 23:01:32 +0000 (16:01 -0700)]
The synopsis of the manpages should use the hyphenated version

The synopsis of the manpages should use the hyphenated version of the git
commands. Adapt the remaining offenders.

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoConvert usage of GIT and Git into git
Christian Meder [Mon, 10 Oct 2005 23:01:31 +0000 (16:01 -0700)]
Convert usage of GIT and Git into git

Convert usage of GIT and Git into git.

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove the version tags from the manpages
Junio C Hamano [Mon, 10 Oct 2005 21:49:52 +0000 (14:49 -0700)]
Remove the version tags from the manpages

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMake rsh.c use sq_quote_buf()
H. Peter Anvin [Mon, 10 Oct 2005 21:46:14 +0000 (14:46 -0700)]
Make rsh.c use sq_quote_buf()

Make rsh.c use sq_quote_buf()

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTrivial optimization
H. Peter Anvin [Mon, 10 Oct 2005 21:46:12 +0000 (14:46 -0700)]
Trivial optimization

GIT_DIR_ENVIRONMENT is always a string literal

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoEnhanced sq_quote()
H. Peter Anvin [Mon, 10 Oct 2005 21:46:10 +0000 (14:46 -0700)]
Enhanced sq_quote()

Create function to sq_quote into a buffer
Handle !'s for csh-based shells

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agot5400-send-pack relies on a working cpio
Johannes Schindelin [Mon, 10 Oct 2005 21:14:22 +0000 (14:14 -0700)]
t5400-send-pack relies on a working cpio

Since cygwin does not install cpio by default, t5400 results in a very
cryptic failure. So, test for cpio explicitely.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit.sh: quote all paths
Jonas Fonseca [Mon, 10 Oct 2005 21:14:06 +0000 (14:14 -0700)]
git.sh: quote all paths

This makes it handle spaces in paths.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTeach git-status about spaces in file names also on MacOSX
Johannes Schindelin [Mon, 10 Oct 2005 20:58:52 +0000 (13:58 -0700)]
Teach git-status about spaces in file names also on MacOSX

Not all sed understands '\t' and consequently cuts off every
file name at the first "t" (or backslash...).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDeal with $(bindir) and friends with whitespaces.
Junio C Hamano [Mon, 10 Oct 2005 20:50:01 +0000 (13:50 -0700)]
Deal with $(bindir) and friends with whitespaces.

... using HPA's shellquote macro.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoOpenBSD needs the strcasestr replacement.
Junio C Hamano [Mon, 10 Oct 2005 18:51:11 +0000 (11:51 -0700)]
OpenBSD needs the strcasestr replacement.

Noticed by Randal L. Schwartz.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAlso force LC_ALL in test scripts.
Junio C Hamano [Mon, 10 Oct 2005 04:58:02 +0000 (21:58 -0700)]
Also force LC_ALL in test scripts.

Noticed by Junichi Uekawa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Mon, 10 Oct 2005 02:16:33 +0000 (19:16 -0700)]
Merge branch 'fixes'

with minor hand resolving on git-tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-tag: update usage string and documentation.
Junio C Hamano [Mon, 10 Oct 2005 02:13:47 +0000 (19:13 -0700)]
git-tag: update usage string and documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoWrite .editmsg in GIT_DIR to avoid being in git-status.
Santi_Béjar [Mon, 10 Oct 2005 00:30:19 +0000 (17:30 -0700)]
Write .editmsg in GIT_DIR to avoid being in git-status.

It appears in the git-status output during a git-commit if you have
something in info/exclude.

Also for .cmitmsg and .cmitchk to make git-commit work
in read-only working trees.

[jc: while we are at it, I removed the use of .cmitchk temporary
     file which was not necessary, and renamed them -- they are out
     of way now and do not have to be dotfiles anymore.]

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoignore new git-diff index header when computing patch ids
Kai Ruemmler [Sun, 9 Oct 2005 23:52:50 +0000 (16:52 -0700)]
ignore new git-diff index header when computing patch ids

Two else equal patches should not result in different checksums, only
because they were applied to different versions of the file.

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix git-verify-tag for light-weight tags
Paolo 'Blaisorblade' Giarrusso [Sun, 9 Oct 2005 23:50:34 +0000 (16:50 -0700)]
Fix git-verify-tag for light-weight tags

It currently exits printing "git-cat-file SHA1: bad file", while
instead we must just abort the verification for light-weight
tags (e.g. referring to commit objects).

[jc: tag objects can tag anything not just commits, so I fixed
 up the original patch slightly.  you should be able to validate
 a signed tag that points at a blob object. ]

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMakefile: avoid error message from 'uname -o'
Junio C Hamano [Sun, 9 Oct 2005 19:52:35 +0000 (12:52 -0700)]
Makefile: avoid error message from 'uname -o'

The platform specific tweaking part was using 'uname -o' which
is not always available.  Squelch error message from it.

It was suggested to chain the if..else, but I chose not to, because
maintaining the nested if..else if..else..endif endif to match is a
pain.  If we had "elif", things would have been different, though.
While we are at it, try not to invoke 'uname -s' for each platform
candidate.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMake sure 'make install' does not have to rebuild templates.
Junio C Hamano [Sun, 9 Oct 2005 01:01:24 +0000 (18:01 -0700)]
Make sure 'make install' does not have to rebuild templates.

The dependency rule in templates directory forced 'make install'
that immediately followed 'make all' to rebuild boilerplates.
This was problematic for a workflow that built first as yourself
and then installed as root, from a working tree that is on an
NFS mounted filesystem that is unwritable by root.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agomake $prefix available for sub-makefiles
Kai Ruemmler [Sat, 8 Oct 2005 22:54:37 +0000 (15:54 -0700)]
make $prefix available for sub-makefiles

exports $prefix and makes Documentation/Makefile following it also.

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoYank writing-back support from gitfakemmap.
Junio C Hamano [Sat, 8 Oct 2005 22:54:36 +0000 (15:54 -0700)]
Yank writing-back support from gitfakemmap.

We do not write through our use of mmap(), so make sure callers pass
MAP_PRIVATE and remove support for writing changes back.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] If NO_MMAP is defined, fake mmap() and munmap()
Johannes Schindelin [Sat, 8 Oct 2005 22:54:36 +0000 (15:54 -0700)]
[PATCH] If NO_MMAP is defined, fake mmap() and munmap()

Since some platforms do not support mmap() at all, and others do only just
so, this patch introduces the option to fake mmap() and munmap() by
malloc()ing and read()ing explicitely.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
19 years agoAlso use 'track_object_refs = 0' in update-server-info.
Junio C Hamano [Sat, 8 Oct 2005 22:54:35 +0000 (15:54 -0700)]
Also use 'track_object_refs = 0' in update-server-info.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoReduce memory usage in git-update-server-info.
robfitz@273k.net [Sat, 8 Oct 2005 22:54:35 +0000 (15:54 -0700)]
Reduce memory usage in git-update-server-info.

Modify parse_object_cheap() to also free all the entries from the tree
data structures.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoCreate object subdirectories on demand
Linus Torvalds [Sat, 8 Oct 2005 22:54:01 +0000 (15:54 -0700)]
Create object subdirectories on demand

This makes it possible to have a "sparse" git object subdirectory
structure, something that has become much more attractive now that people
use pack-files all the time.

As a result of pack-files, a git object directory doesn't necessarily have
any individual objects lying around, and in that case it's just wasting
space to keep the empty first-level object directories around: on many
filesystems the 256 empty directories will be aboue 1MB of diskspace.

Even more importantly, after you re-pack a project that _used_ to be
unpacked, you could be left with huge directories that no longer contain
anything, but that waste space and take time to look through.

With this change, "git prune-packed" can just do an rmdir() on the
directories, and they'll get removed if empty, and re-created on demand.

This patch also tries to fix up "write_sha1_from_fd()" to use the new
common infrastructure for creating the object files, closing a hole where
we might otherwise leave half-written objects in the object database.

[jc: I unoptimized the part that really removes the fan-out directories
 to ease transition.  init-db still wastes 1MB of diskspace to hold 256
 empty fan-outs, and prune-packed rmdir()'s the grown but empty directories,
 but runs mkdir() immediately after that -- reducing the saving from 150KB
 to 146KB.  These parts will be re-introduced when everybody has the
 on-demand capability.]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoGive proper prototype to gitstrcasestr.
Junio C Hamano [Sat, 8 Oct 2005 21:54:41 +0000 (14:54 -0700)]
Give proper prototype to gitstrcasestr.

Borrow from NO_MMAP patch by Johannes, squelch compiler warnings by
declaring gitstrcasestr() when we use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Sat, 8 Oct 2005 00:06:21 +0000 (17:06 -0700)]
Merge branch 'fixes'

19 years agoteach git-status about spaces in filenames
Kai Ruemmler [Fri, 7 Oct 2005 23:55:00 +0000 (16:55 -0700)]
teach git-status about spaces in filenames

git-status truncates filenames up to the first occurrence of a whitespace
character when displaying.  More precisely, it displays the filename up to any
field seperator defined in $IFS.

This patch fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix wrong filename listing bug in git-ls-tree.
robfitz@273k.net [Fri, 7 Oct 2005 23:54:06 +0000 (16:54 -0700)]
Fix wrong filename listing bug in git-ls-tree.

This patch fixes a bug in git-ls-tree in which the wrong filenames are
listed if the exact same file and directory contents are present in
another location in the tree.

Added a new series of test cases for directory and filename handling.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agos/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt
Kai Ruemmler [Fri, 7 Oct 2005 21:05:03 +0000 (14:05 -0700)]
s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt

This updates last place where checkout-cache gets mentioned wrongly
for checkout-index.

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd git-am, applymbox replacement.
Junio C Hamano [Fri, 7 Oct 2005 10:44:18 +0000 (03:44 -0700)]
Add git-am, applymbox replacement.

It reorganizes the code and also has saner command line options
syntax.  Unlike git-applymbox, it can take more than one mailbox
file from the command line, as well as reading from the standard
input when '-' is specified.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoupdate-index: read --show-index-info output from standard input.
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
update-index: read --show-index-info output from standard input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-apply: parse index information
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
git-apply: parse index information

Add an new option --show-index-info to git-apply command to
summarize the index information new git-diff outputs.  The
command shows something similar to git-ls-files --stage output
for the pre-change image:

    100644 7be5041... apply.c
    100644 ec2a161... cache.h
    ...

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoShow original and resulting blob object info in diff output.
Junio C Hamano [Fri, 7 Oct 2005 10:42:00 +0000 (03:42 -0700)]
Show original and resulting blob object info in diff output.

This adds more cruft to diff --git header to record the blob SHA1 and
the mode the patch/diff is intended to be applied against, to help the
receiving end fall back on a three-way merge.  The new header looks
like this:

    diff --git a/apply.c b/apply.c
    index 7be5041..8366082 100644
    --- a/apply.c
    +++ b/apply.c
    @@ -14,6 +14,7 @@
     //    files that are being modified, but doesn't apply the patch
     //  --stat does just a diffstat, and doesn't actually apply
    +//  --show-index-info shows the old and new index info for...
    ...

Upon receiving such a patch, if the patch did not apply cleanly to the
target tree, the recipient can try to find the matching old objects in
her object database and create a temporary tree, apply the patch to
that temporary tree, and attempt a 3-way merge between the patched
temporary tree and the target tree using the original temporary tree
as the common ancestor.

The patch lifts the code to compute the hash for an on-filesystem
object from update-index.c and makes it available to the diff output
routine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agomailsplit: allow feeding mbox from standard input.
Junio C Hamano [Thu, 6 Oct 2005 22:55:43 +0000 (15:55 -0700)]
mailsplit: allow feeding mbox from standard input.

When mbox argument is missing, read the mailbox from the standard
input.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDescribe new options to git-format-patch and git-mailsplit.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Describe new options to git-format-patch and git-mailsplit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agomailsplit: -d<prec>
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
mailsplit: -d<prec>

Instead of the default 4 digits with leading zeros, different precision
can be specified for the generated filenames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-format-patch: --stdout option.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
git-format-patch: --stdout option.

This new flag generates the mbox formatted output to the standard
output, instead of saving them into a file per patch and implies --mbox.

It also fixes a corner case where the commit does not have *any* message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoClean mail files after dealing with them.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Clean mail files after dealing with them.

When you are applying 200 mails in sequence, .dotest/ directory
will be littered with many messsages, and when the patch in one
of them fails to apply, it is not obvious which message was
being processed.  Remove the one that has been already dealt
with, so that the last failed one is found typically as the
lowest numbered split message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFall back to three-way merge when applying a patch.
Junio C Hamano [Thu, 6 Oct 2005 21:25:52 +0000 (14:25 -0700)]
Fall back to three-way merge when applying a patch.

After git-apply fails, attempt to find a base tree that the patch
cleanly applies to, and do a three-way merge using that base tree into
the current index, if .dotest/.3way file exists.  This flag can be
controlled by giving -m flag to git-applymbox command.

When the fall-back merge fails, the working tree can be resolved the
same way as you would normally hand resolve a conflicting merge.
When making commit, use .dotest/final-commit as the log message
template.  Or you could just choose to 'git-checkout-index -f -a'
to revert the failed merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAllow "-u" flag to tag signing
Linus Torvalds [Thu, 6 Oct 2005 21:10:39 +0000 (14:10 -0700)]
Allow "-u" flag to tag signing

The current "git tag -s" thing always uses the tagger name as the signing
user key, which is very irritating, since my key is under my email
address, but the tagger key obviously contains the actual machine name
too.

Now, I could just use "GIT_COMMITTER_EMAIL" and force it to be my real
email, but I actually think that it's nice to see which machine I use for
my work.

So rather than force my tagger ID to have to match the gpg key name, just
support the "-u" flag to "git tag" instead. It implicitly enables signing,
since it doesn't make any sense without it. Thus:

git tag -u <gpg-key-name> <tag-name> [<tagged-object>]

will use the named gpg key for signing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDo not require ls-remote to be run inside a git repository.
Alex Riesen [Thu, 6 Oct 2005 21:10:39 +0000 (14:10 -0700)]
Do not require ls-remote to be run inside a git repository.

The scripts work perfectly without a repository.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-shortlog: make the mailmap configurable.
Junio C Hamano [Thu, 6 Oct 2005 08:37:17 +0000 (01:37 -0700)]
git-shortlog: make the mailmap configurable.

In addition to hardcoded list of kernel people, read from .mailmap file
the list of email-to-name translations.  Modernize regexps here and there
minimally while at it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 5 Oct 2005 23:57:23 +0000 (16:57 -0700)]
Merge branch 'fixes'

19 years agoFix usage of carets in git-rev-parse(1)
Jonas Fonseca [Wed, 5 Oct 2005 23:56:31 +0000 (16:56 -0700)]
Fix usage of carets in git-rev-parse(1)

... but using a {caret} attribute.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoclone-pack: use create_symref() instead of raw symlink.
Junio C Hamano [Wed, 5 Oct 2005 22:29:48 +0000 (15:29 -0700)]
clone-pack: use create_symref() instead of raw symlink.

This was the last instance of symlink() in coreish part.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSome typos and light editing of various manpages
Christian Meder [Wed, 5 Oct 2005 22:08:26 +0000 (15:08 -0700)]
Some typos and light editing of various manpages

Typos, light editing and clarifications.

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoupload-pack: Do not choke on too many heads request.
Junio C Hamano [Wed, 5 Oct 2005 21:49:54 +0000 (14:49 -0700)]
upload-pack: Do not choke on too many heads request.

Cloning from a repository with more than 256 refs (heads and tags
included) will choke, because upload-pack has a built-in limit of
feeding not more than MAX_NEEDS (currently 256) heads to underlying
git-rev-list.  This is a problem when cloning a repository with many
tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+
tags.

This commit introduces a new flag, --all, to git-rev-list, to include
all refs in the repository.  Updated upload-pack detects requests that
ask more than MAX_NEEDS refs, and sends everything back instead.

We may probably want to tweak the definitions of MAX_NEEDS and
MAX_HAS, but that is a separate topic.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Quote the missing GIT_DIR.
Santi_Béjar [Wed, 5 Oct 2005 16:58:10 +0000 (18:58 +0200)]
[PATCH] Quote the missing GIT_DIR.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix symbolic ref validation
Jonas Fonseca [Wed, 5 Oct 2005 15:52:12 +0000 (17:52 +0200)]
[PATCH] Fix symbolic ref validation

Use the correct buffer when validating 'ref: refs/...'

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit
Alex Riesen [Wed, 5 Oct 2005 14:58:11 +0000 (16:58 +0200)]
[PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit

Set up atexit only if the .lock-file was opened successfully.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix diff-filter All-Or-None mark.
Junio C Hamano [Wed, 5 Oct 2005 00:44:17 +0000 (17:44 -0700)]
Fix diff-filter All-Or-None mark.

When we updated the marker for new files from 'N' to 'A', we forgot to
notice that the letter is already taken by the All-Or-None mark.
Change the All-Or-None marker to '*' to resolve this conflict.

git-diff-tree -r --diff-filter='R*' -M

shows all the changes (not just renames) that are contained in commits
that have renames, in comparison with:

git-diff-tree -r --diff-filter='R' -M

shows the same set of changes but the diff output are limited only to
renaming changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRecord which tree the patch applies to.
Junio C Hamano [Tue, 4 Oct 2005 19:41:35 +0000 (12:41 -0700)]
Record which tree the patch applies to.

Also note which version of GIT produced the patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-applypatch: cleanup.
Junio C Hamano [Tue, 4 Oct 2005 08:11:27 +0000 (01:11 -0700)]
git-applypatch: cleanup.

 - Defined variable $INFO was not used properly.
 - Make sure there is an empty line between the sign-off and the
   log message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-apply: retire unused/unimplemented --no-merge flag.
Junio C Hamano [Tue, 4 Oct 2005 05:28:45 +0000 (22:28 -0700)]
git-apply: retire unused/unimplemented --no-merge flag.

The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-apply: allow operating in sparsely populated working tree.
Junio C Hamano [Mon, 3 Oct 2005 20:16:39 +0000 (13:16 -0700)]
git-apply: allow operating in sparsely populated working tree.

This patch teaches 'git-apply --index' to automatically check
out a file being patched.  This happens only when the working
tree does not have it checked out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoReturn error when not checking out an entry due to dirtiness.
Junio C Hamano [Mon, 3 Oct 2005 19:44:48 +0000 (12:44 -0700)]
Return error when not checking out an entry due to dirtiness.

Without -f flag, 'git-checkout-index foo.c' issued an error message
when foo.c already existed in the working tree and did not match index.
However it did not return an error from the underlying checkout_entry()
function and resulted in a successful exit(0).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 5 Oct 2005 00:04:26 +0000 (17:04 -0700)]
Merge branch 'fixes'

19 years agoAdd missing documentation.
Junio C Hamano [Tue, 4 Oct 2005 23:45:01 +0000 (16:45 -0700)]
Add missing documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove useless use of sed in git-format-patch.
Junio C Hamano [Tue, 4 Oct 2005 07:40:59 +0000 (00:40 -0700)]
Remove useless use of sed in git-format-patch.

There was a leftover use of sed that attempted to remove the commit ID
output from git-diff-tree, which turned into an expensive no-op when
git-diff-tree output header format changed about three months ago.
Drop it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoLeave an empty line between log and sign-off.
Junio C Hamano [Tue, 4 Oct 2005 06:49:46 +0000 (23:49 -0700)]
Leave an empty line between log and sign-off.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove unused external-diff script.
Junio C Hamano [Tue, 4 Oct 2005 06:47:19 +0000 (23:47 -0700)]
Remove unused external-diff script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Limit the number of requests outstanding in ssh-fetch.
Daniel Barkalow [Tue, 4 Oct 2005 04:24:55 +0000 (00:24 -0400)]
[PATCH] Limit the number of requests outstanding in ssh-fetch.

This completes fetches if there are more than 100 outstanding requests
and there are more to prefetch.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoOn Cygwin, use symbolic ref, not a symbolic link, to express .git/HEAD
Junio C Hamano [Tue, 4 Oct 2005 02:05:01 +0000 (19:05 -0700)]
On Cygwin, use symbolic ref, not a symbolic link, to express .git/HEAD

H. Peter Anvin says that Samba "promotes" symlinks to hardlinks while
Cygwin itself uses .lnk files to emulate symlinks.  Avoid using symbolic
link for .git/HEAD on Cygwin.

This does not help the symlinks recorded in trees as user data, but
at least we do not use them for our own bookkeeping.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)]
Merge branch 'fixes'

19 years agoAvoid compiler warning.
Junio C Hamano [Tue, 4 Oct 2005 02:11:32 +0000 (19:11 -0700)]
Avoid compiler warning.
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMake sure get_sha1 does not accept ambiguous sha1 prefix (again).
Junio C Hamano [Mon, 3 Oct 2005 04:40:51 +0000 (21:40 -0700)]
Make sure get_sha1 does not accept ambiguous sha1 prefix (again).

The earlier fix incorrectly dropped the code the original had to
ensure the found SHA1 is at least unique within the same pack.
Restore the check.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge with master.kernel.org:/pub/scm/git/git.git
Peter Anvin [Mon, 3 Oct 2005 23:42:45 +0000 (16:42 -0700)]
Merge with master.kernel.org:/pub/scm/git/git.git

19 years agoMerge branch 'fixes'
Junio C Hamano [Mon, 3 Oct 2005 23:32:57 +0000 (16:32 -0700)]
Merge branch 'fixes'

19 years ago[PATCH] Merging the Cygwin changes
Junio C Hamano [Mon, 3 Oct 2005 23:05:50 +0000 (16:05 -0700)]
[PATCH] Merging the Cygwin changes

Fix mismerge typo.

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