add_file_to_cache().

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

When you pass git-merge-cache the -o option, it tries to do all the
automatic merges and possibly return error if any of them failed, instead
of the default behaviour of failing immediately after the first failed
automatic merge.

Ported from the Cogito branch - Cogito needs this behaviour.

Two other README spelling fixes. I wasn't able to pinpoint the relevant
commit in the cogito branch, but they are fairly trivial anyway.

Signed-off-by: NZack Brown <zbrown@tumblerings.org>
Signed-off-by: NPetr Baudis <pasky@ucw.cz>

* README: spell checked
Signed-off-by: NPavel Roskin <proski@gnu.org>

Few more s/ie/i.e./ fixes.
Signed-off-by: NPetr Baudis <pasky@ucw.cz>

This allows git to be built even with linkers which are not smart enough
to join those symbols, and makes this correct C. Pointed out by several
people.

Makefile for html and man
Signed-off-by: NDavid Greaves <david@dgreaves.com>

Update git environment variable docs
Update first section of command docs (Manipulation commands section)
Signed-off-by: NDavid Greaves <david@dgreaves.com>

Rearrange commands in git.txt
Signed-off-by: NDavid Greaves <david@dgreaves.com>

Split the core-git.txt file
Formatting fix to the diff-format.txt
Signed-off-by: NDavid Greaves <david@dgreaves.com>

Mark Allen had trouble with building GIT on his Darwin and
posted a patch to link with -lcrypto instead of -lssl on Darwin.
Later Daniel Barkalow suggested to change it for everybody who
uses openssl, because the relevant functionality is in -lcrypto
not in -lssl, and the current linking happens to work only
because -lssl pulls in -lcrypto.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Reporting st.st_size with %ld is simply wrong, as H Peter Anvin
says.  No other pull drivers report the failure with size
anyway, so yank it out.  This is a cop-out patch but should be
good enough.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

During the mailing list discussion on renaming GIT_ environment
variables, people felt that having one environment that lets the
user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now
GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout
would be handy.  This change introduces GIT_DIR environment
variable, from which the defaults for GIT_INDEX_FILE and
GIT_OBJECT_DIRECTORY are derived.  When GIT_DIR is not defined,
it defaults to ".git".  GIT_INDEX_FILE defaults to
"$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to
"$GIT_DIR/objects".

Special thanks for ideas and discussions go to Petr Baudis and
Daniel Barkalow.  Bugs are mine ;-)
Signed-off-by: NJunio C Hamano <junkio@cox.net>

H. Peter Anvin mentioned that using SHA1_whatever as an
environment variable name is not nice and we should instead use
names starting with "GIT_" prefix to avoid conflicts.  Here is
what this patch does:

 * Renames the following environment variables:

    New name                           Old Name

    GIT_AUTHOR_DATE                    AUTHOR_DATE
    GIT_AUTHOR_EMAIL                   AUTHOR_EMAIL
    GIT_AUTHOR_NAME                    AUTHOR_NAME
    GIT_COMMITTER_EMAIL                COMMIT_AUTHOR_EMAIL
    GIT_COMMITTER_NAME                 COMMIT_AUTHOR_NAME
    GIT_ALTERNATE_OBJECT_DIRECTORIES   SHA1_FILE_DIRECTORIES
    GIT_OBJECT_DIRECTORY               SHA1_FILE_DIRECTORY

 * Introduces a compatibility macro, gitenv(), which does an
   getenv() and if it fails calls gitenv_bc(), which in turn
   picks up the value from old name while giving a warning about
   using an old name.

 * Changes all users of the environment variable to fetch
   environment variable with the new name using gitenv().

 * Updates the documentation and scripts shipped with Linus GIT
   distribution.

The transition plan is as follows:

 * We will keep the backward compatibility list used by gitenv()
   for now, so the current scripts and user environments
   continue to work as before.  The users will get warnings when
   they have old name but not new name in their environment to
   the stderr.

 * The Porcelain layers should start using new names.  However,
   just in case it ends up calling old Plumbing layer
   implementation, they should also export old names, taking
   values from the corresponding new names, during the
   transition period.

 * After a transition period, we would drop the compatibility
   support and drop gitenv().  Revert the callers to directly
   call getenv() but keep using the new names.

   The last part is probably optional and the transition
   duration needs to be set to a reasonable value.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The error detection logic was too lazy to distinguish parameter
error and unable-to-add case.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Reformat core-git.txt to asciidoc format.
Includes split-docs.pl to create individual txt, html and man pages.

<JC> Editorial note.  I've updated to add git-diff-cache -m and
git-update-cache --replace description on top of the version
David posted to the GIT list and got his OK.
Signed-off-by: NDavid Greaves <david@dgreaves.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Changes "if (pointer == 0)" to "if (!pointer)" to match the rest
of the code, noticed by Petr Baudis.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This fixes stylistic problems and one unused variable spotted by
Petr Baudis.  The buf variable unused in prepare_alt_odb() is
gone and the "creepy" function is more heavily documented.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Sorts core-git.txt into alphabetical order
Signed-off-by: NDavid Greaves <david@dgreaves.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

A deflate loop in sha1_file.c would have /* nothing */ as its
body, but the semicolon was missing, so the next command was run.
Fortunately the loop went through exactly once so it didn't trigger
an actual bug so far.
Signed-Off-by: NThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: NPetr Baudis <pasky@ucw.cz>

Cogito wants to be able to do some initial commit at the time of cg-init,
which may be empty in case when cg-init is called in an empty tree.

When we used to have "path" as a file or a symlink, but now we
have "path/file" (or in general, have "path" as a directory), we
would want to remove "path" before adding "path/file".  The
logic in add_file_to_cache() only runs lstat() and does not
detect this case and fails to allow removing it in this case.
In the opposite case of having "path/file" in the index and
having "path" on the filesystem as a file or a symlink we do
allow removal of "path/file", so to be symmetric we should allow
it as well, without forcing the user to say --force-remove.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When "path" exists as a file or a symlink in the index, an
attempt to add "path/file" is refused because it results in file
vs directory conflict.  Similarly when "path/file1",
"path/file2", etc. exist, an attempt to add "path" as a file or
a symlink is refused.  With git-update-cache --replace, these
existing entries that conflict with the entry being added are
automatically removed from the cache, with warning messages.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

And vice versa.  The next commit will introduce an option
--replace to allow replacing existing entries.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This useful program is not build nor installed by the Makefile.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This is a follow-up fix to the earlier "Notice index that has
path and path/file and refuse to write such a tree" patch.
With this fix, git-fsck-cache complains if a tree object stores
more than one entries with the same name.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

On Solaris machines gnu install called ginstall

<JC> Editorial notes.  I've also changed it to use $(COPTS), $(prefix),
and $(bin) because I always get confused without compiling it with -O1
when I single step in gdb.  The default is left as Linus shipped.

Date:	Sat, 7 May 2005 10:41:54 +0200
Signed-off-by: NThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

<JC> Editorial Note.  We may want to include standard headers in one
of those headers everybody includes, e.g. cache.h, to reduce clutters,
but this commit is as Thomas posted to the GIT list.

Date:	Sat, 7 May 2005 10:41:41 +0200
Signed-off-by: NThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Thomas Glanzmann says that shell he uses on Solaris cannot grok
$(command) but the script does not use nested $(command) and 
works happily just by using backticks instead.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Kay Sievers noticed that you can have both path and path/file in
the cache and write-tree happily creates a tree object from such
a state.  Since a merge can result in such situation and the
user should be able to see the situation by looking at the
cache, rather than forbidding add_cache_entry() to create such
conflicts, fix it by making write-tree refuse to write such an
nonsensical tree.  Here is a test case.

-- test case --

$ ls -a
./  ../
$ git-init-db
defaulting to local storage area
$ date >path
$ git-update-cache --add path
$ rm path
$ mkdir path
$ date >path/file
$ git-update-cache --add path/file
$ git-ls-files --stage
100644 1738f2536b1201218c41153941da065cc26174c9 0 path
100644 620c72f1c1de15f56ff9d63d6d7cdc69e828f1e3 0 path/file
$ git-ls-tree $(git-write-tree)                     ;# using old one
100644	blob	1738f2536b1201218c41153941da065cc26174c9	path
040000	tree	ec116937f223e3df95aeac9f076902ae1618ae98	path
$ ../git-write-tree                                 ;# using new one
You have both path and path/file
fatal: write-tree: not able to write tree
$ exit
Signed-off-by: NJunio C Hamano <junkio@cox.net>

fails, but go on and return error code at the end. It makes sense
to try to merge everything, then let the user solve the commits
at once.

Author: Ingo Molnar <mingo@elte.hu>
    
[patch] git: fix memory leak in checkout-cache.c

this patch fixes a memory leak in checkout-cache.
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Signed-off-by: NPetr Baudis <pasky@ucw.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This does not matter for commands that write just a handful SHA1 files,
but is noticeable in git-convert-cache which essentially traverses the
entire object database.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

An unmerged path is given as the sole parameter to the script, so it
should check against $# being 1, not 2.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

SHA1_FILE_DIRECTORIES environment variable is a colon separated paths
used when looking for SHA1 files not found in the usual place for
reading.  Creating a new SHA1 file does not use this alternate object
database location mechanism.  This is useful to archive older, rarely
used objects into separate directories.
Signed-off-by: NJunio C Hamano <junkio@cox.net>