gitweb.git
Spelling fixes in README.Zack Brown Mon, 25 Apr 2005 21:28:33 +0000 (14:28 -0700)

Spelling fixes in README.

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

[PATCH] Misc fixes for git-paskyPavel Roskin Fri, 15 Apr 2005 03:35:00 +0000 (23:35 -0400)

[PATCH] Misc fixes for git-pasky

* README: spell checked

Signed-off-by: Pavel Roskin <proski@gnu.org>
Few more s/ie/i.e./ fixes.

Signed-off-by: Petr Baudis <pasky@ucw.cz>

Merge ... http://members.cox.net/junkio/git-jc.gitPetr Baudis Wed, 11 May 2005 00:00:49 +0000 (02:00 +0200)

Merge ... http://members.cox.net/junkio/git-jc.git

Mark the variable declarations in .h files as externPetr Baudis Tue, 10 May 2005 22:58:16 +0000 (00:58 +0200)

Mark the variable declarations in .h files as extern

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.

[PATCH 4/4] split core-git.txt and updateDavid Greaves Tue, 10 May 2005 21:32:39 +0000 (22:32 +0100)

[PATCH 4/4] split core-git.txt and update

Makefile for html and man

Signed-off-by: David Greaves <david@dgreaves.com>

[PATCH 3/4] split core-git.txt and updateDavid Greaves Tue, 10 May 2005 21:32:38 +0000 (22:32 +0100)

[PATCH 3/4] split core-git.txt and update

Update git environment variable docs
Update first section of command docs (Manipulation commands section)

Signed-off-by: David Greaves <david@dgreaves.com>

[PATCH 2/4] split core-git.txt and updateDavid Greaves Tue, 10 May 2005 21:32:37 +0000 (22:32 +0100)

[PATCH 2/4] split core-git.txt and update

Rearrange commands in git.txt

Signed-off-by: David Greaves <david@dgreaves.com>

[PATCH 1/4] split core-git.txt and updateDavid Greaves Tue, 10 May 2005 21:32:30 +0000 (22:32 +0100)

[PATCH 1/4] split core-git.txt and update

Split the core-git.txt file
Formatting fix to the diff-format.txt

Signed-off-by: David Greaves <david@dgreaves.com>

Link with -lcrypto instead of -lssl when using openssl... Junio C Hamano Tue, 10 May 2005 20:25:27 +0000 (13:25 -0700)

Link with -lcrypto instead of -lssl when using openssl libraries.

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: Junio C Hamano <junkio@cox.net>

Do not report size of the object that cannot be written... Junio C Hamano Tue, 10 May 2005 06:48:21 +0000 (23:48 -0700)

Do not report size of the object that cannot be written in local-pull.c

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: Junio C Hamano <junkio@cox.net>

Introduce GIT_DIR environment variable.Junio C Hamano Tue, 10 May 2005 05:57:58 +0000 (22:57 -0700)

Introduce GIT_DIR environment variable.

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: Junio C Hamano <junkio@cox.net>

Rename environment variables.Junio C Hamano Tue, 10 May 2005 00:57:56 +0000 (17:57 -0700)

Rename environment variables.

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: Junio C Hamano <junkio@cox.net>

Add copyright notice of Rene Scharfe to tar-tree.cPetr Baudis Mon, 9 May 2005 21:33:02 +0000 (23:33 +0200)

Add copyright notice of Rene Scharfe to tar-tree.c

Fix git-update-cache --cacheinfo error message.Junio C Hamano Sun, 8 May 2005 22:31:33 +0000 (15:31 -0700)

Fix git-update-cache --cacheinfo error message.

The error detection logic was too lazy to distinguish parameter
error and unable-to-add case.

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

[PATCH 2/2] core-git documentation updateDavid Greaves Sun, 8 May 2005 17:22:48 +0000 (18:22 +0100)

[PATCH 2/2] core-git documentation update

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: David Greaves <david@dgreaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

A stylistic fix to read-cache.cJunio C Hamano Sun, 8 May 2005 21:02:19 +0000 (14:02 -0700)

A stylistic fix to read-cache.c

Changes "if (pointer == 0)" to "if (!pointer)" to match the rest
of the code, noticed by Petr Baudis.

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

Stylistic fixes to sha1_file.cJunio C Hamano Sun, 8 May 2005 20:51:13 +0000 (13:51 -0700)

Stylistic fixes to sha1_file.c

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: Junio C Hamano <junkio@cox.net>

[PATCH 1/2] core-git documentation updateDavid Greaves Sun, 8 May 2005 17:22:45 +0000 (18:22 +0100)

[PATCH 1/2] core-git documentation update

Sorts core-git.txt into alphabetical order

Signed-off-by: David Greaves <david@dgreaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Really *do* nothing in while loopThomas Glanzmann Sun, 8 May 2005 09:34:40 +0000 (11:34 +0200)

[PATCH] Really *do* nothing in while loop

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: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Petr Baudis <pasky@ucw.cz>

write-tree is now willing to write empty treePetr Baudis Sun, 8 May 2005 14:15:59 +0000 (16:15 +0200)

write-tree is now willing to write empty tree

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.

Allow removal of "path" when "path/file" exists.Junio C Hamano Sun, 8 May 2005 07:05:18 +0000 (00:05 -0700)

Allow removal of "path" when "path/file" exists.

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: Junio C Hamano <junkio@cox.net>

Add git-update-cache --replace option.Junio C Hamano Sun, 8 May 2005 04:55:21 +0000 (21:55 -0700)

Add git-update-cache --replace option.

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: Junio C Hamano <junkio@cox.net>

git-update-cache refuses to add a file where a director... Junio C Hamano Sun, 8 May 2005 04:48:12 +0000 (21:48 -0700)

git-update-cache refuses to add a file where a directory is registed.

And vice versa. The next commit will introduce an option
--replace to allow replacing existing entries.

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

Build and install git-get-tar-commit-idJunio C Hamano Sun, 8 May 2005 04:44:17 +0000 (21:44 -0700)

Build and install git-get-tar-commit-id

This useful program is not build nor installed by the Makefile.

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

Notice tree objects with duplicate entries.Junio C Hamano Sat, 7 May 2005 21:43:32 +0000 (14:43 -0700)

Notice tree objects with duplicate entries.

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: Junio C Hamano <junkio@cox.net>

[PATCH] make INSTALL binary in Makefile configurable... Thomas Glanzmann Sat, 7 May 2005 08:41:54 +0000 (10:41 +0200)

[PATCH] make INSTALL binary in Makefile configurable via make variable

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: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Add #include <limits.h> so that git compiles... Thomas Glanzmann Sat, 7 May 2005 08:41:41 +0000 (10:41 +0200)

[PATCH] Add #include <limits.h> so that git compiles under Solaris

<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: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use backticks in git-merge-one-file-script instead... Junio C Hamano Sat, 7 May 2005 19:26:15 +0000 (12:26 -0700)

Use backticks in git-merge-one-file-script instead of $(command).

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: Junio C Hamano <junkio@cox.net>

Notice index that has path and path/file and refuse... Junio C Hamano Sat, 7 May 2005 19:22:02 +0000 (12:22 -0700)

Notice index that has path and path/file and refuse to write such a tree.

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: Junio C Hamano <junkio@cox.net>

Make merge-cache not fail immediatelly when the merge... Petr Baudis Tue, 19 Apr 2005 02:16:15 +0000 (04:16 +0200)

Make merge-cache not fail immediatelly when the merge program
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.

Date: Thu Apr 14 08:26:38 2005 +0200Ingo Molnar Thu, 14 Apr 2005 06:26:38 +0000 (08:26 +0200)

Date:Thu Apr 14 08:26:38 2005 +0200
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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Free compressed buffer after write_sha1_file() is done.Junio C Hamano Sat, 7 May 2005 08:27:00 +0000 (01:27 -0700)

Free compressed buffer after write_sha1_file() is done.

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: Junio C Hamano <junkio@cox.net>

Fix usage string of git-diff-cache and add documentatio... Junio C Hamano Sat, 7 May 2005 08:11:00 +0000 (01:11 -0700)

Fix usage string of git-diff-cache and add documentation of -m flag.

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

Fix thinko in the logic to refuse unmerged path fed... Junio C Hamano Sat, 7 May 2005 07:48:00 +0000 (00:48 -0700)

Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.

An unmerged path is given as the sole parameter to the script, so it
should check against $# being 1, not 2.

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

Introduce SHA1_FILE_DIRECTORIES to support multiple... Junio C Hamano Sat, 7 May 2005 07:38:04 +0000 (00:38 -0700)

Introduce SHA1_FILE_DIRECTORIES to support multiple object databases.

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: Junio C Hamano <junkio@cox.net>

[PATCH] Lift path length limits from git-tar-tree.Rene Scharfe Sat, 7 May 2005 00:57:06 +0000 (02:57 +0200)

[PATCH] Lift path length limits from git-tar-tree.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Remove unused sha1_file_directory variable.Junio C Hamano Fri, 6 May 2005 23:33:39 +0000 (16:33 -0700)

[PATCH] Remove unused sha1_file_directory variable.

Now all the users have gone.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Do not initialize sha1_file_directory by hand.Junio C Hamano Fri, 6 May 2005 23:32:28 +0000 (16:32 -0700)

[PATCH] Do not initialize sha1_file_directory by hand.

Some commands initialize sha1_file_directory by hand. There is no
need to do so; sha1_file.c knows how to handle it.

The next patch will remove the variable altogether.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Revert bogus optimization that avoids index file writesLinus Torvalds Fri, 6 May 2005 23:48:43 +0000 (16:48 -0700)

Revert bogus optimization that avoids index file writes

It didn't properly mark all cache updates as being dirty, and
causes merge errors due to that. In particular, it didn't notice
when a file was force-removed.

Besides, it was ugly as hell. I've put in place a slightly cleaner
version, but I've not enabled the optimization because I don't
want to be burned again.

diff-tree: add author/date information to the verbose... Linus Torvalds Fri, 6 May 2005 22:33:59 +0000 (15:33 -0700)

diff-tree: add author/date information to the verbose output

date.c: add "show_date()" function.Linus Torvalds Fri, 6 May 2005 22:28:59 +0000 (15:28 -0700)

date.c: add "show_date()" function.

Kind of like ctime(), but not as broken.

[PATCH] Document --stdin, -m, -s, and -v flags to git... Junio C Hamano Fri, 6 May 2005 20:17:13 +0000 (13:17 -0700)

[PATCH] Document --stdin, -m, -s, and -v flags to git-diff-tree

This updates the usage message string and Documentation/core-git.txt
to describe the new flags added to the git-diff-tree command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] git-tar-tree: add symlink supportRene Scharfe Fri, 6 May 2005 20:56:16 +0000 (22:56 +0200)

[PATCH] git-tar-tree: add symlink support

Add symlink support to git-tar-tree.

[PATCH] git-tar-tree: make file contents accessible... Rene Scharfe Fri, 6 May 2005 20:56:08 +0000 (22:56 +0200)

[PATCH] git-tar-tree: make file contents accessible to write_header()

Pass pointer to filecontents to write_header() and pass pointer
to filecontents, its size and some flags to write_exntended_header().
These parameters are not used, yet. They are added in preparation
to symlink support.

[PATCH] git-tar-tree: add extended header helpersRene Scharfe Fri, 6 May 2005 20:56:01 +0000 (22:56 +0200)

[PATCH] git-tar-tree: add extended header helpers

Introduce append_extended_header_prefix(), extended_header_len()
and append_extended_header(). These are helper functions that
make it easier to handle multiple entries in a pax extended
header. append_log() is no longer needed and can go away.

[PATCH] git-tar-tree: add TYPEFLAG_ constantsRene Scharfe Fri, 6 May 2005 20:55:52 +0000 (22:55 +0200)

[PATCH] git-tar-tree: add TYPEFLAG_ constants

Add TYPEFLAG_ constants.

[PATCH] git-tar-tree: add get_record()Rene Scharfe Fri, 6 May 2005 20:55:42 +0000 (22:55 +0200)

[PATCH] git-tar-tree: add get_record()

Add get_record() which returns a pointer to the next record in the block.

diff-tree: add "verbose header" modeLinus Torvalds Fri, 6 May 2005 18:42:47 +0000 (11:42 -0700)

diff-tree: add "verbose header" mode

This allows you to trivially do fancy and readable output. Something like

git-rev-list HEAD | git-diff-tree -p -v --stdin kernel/ | less -S

gives a nice output of what has changed in the kernel/ subdirectory lately.

[PATCH] don't load and decompress objects twice with... Nicolas Pitre Fri, 6 May 2005 17:48:34 +0000 (13:48 -0400)

[PATCH] don't load and decompress objects twice with parse_object()

It turns out that parse_object() is loading and decompressing given
object to free it just before calling the specific object parsing
function which does mmap and decompress the same object again. This
patch introduces the ability to parse specific objects directly from a
memory buffer.

Without this patch, running git-fsck-cache on the kernel repositorytake:

real 0m13.006s
user 0m11.421s
sys 0m1.218s

With this patch applied:

real 0m8.060s
user 0m7.071s
sys 0m0.710s

The performance increase is significant, and this is kind of a
prerequisite for sane delta object support with fsck.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

git-diff-tree: clean up outputLinus Torvalds Fri, 6 May 2005 17:56:35 +0000 (10:56 -0700)

git-diff-tree: clean up output

This only shows the tree headers when something actually changed. Also,
add a "silent" mode, which doesn't actually show the changes at all,
just the commit information.

diff-tree: support list if input trees on stdinLinus Torvalds Fri, 6 May 2005 17:03:17 +0000 (10:03 -0700)

diff-tree: support list if input trees on stdin

This means that you can do

git-rev-list HEAD --max-count=10 | git-diff-tree --stdin update-cache.c

to see which (if any) of the last ten commits changed update-cache.c.

Use the "-m" flag to see merges too. Normally they are suppressed.

[PATCH] control/limit output of git-rev-listKay Sievers Fri, 6 May 2005 08:00:11 +0000 (10:00 +0200)

[PATCH] control/limit output of git-rev-list

gitweb.cgi's default view is the log of the last day and git-rev-list
can stop crawling the whole repo if we have all our data to display in the
browser. Also the rss-feed query needs only the last 20 items. This
will speeds up these queries dramatically.

usage: rev-list [OPTION] commit-id
--max-count=nr
--max-age=epoch
--min-age=epoch

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

update-cache: remove compiler warningLinus Torvalds Fri, 6 May 2005 15:49:07 +0000 (08:49 -0700)

update-cache: remove compiler warning

"Unused variable len"

[PATCH] fix compare symlink against readlink not dataKay Sievers Fri, 6 May 2005 13:45:01 +0000 (15:45 +0200)

[PATCH] fix compare symlink against readlink not data

Fix update-cache to compare the blob of a symlink against the link-target
and not the file it points to. Also ignore all permissions applied to
links.

Thanks to Greg for recognizing this while he added our list of symlinks
back to the udev repository.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Steal -t option to git-ls-files from Cogito fork.Petr Baudis Fri, 22 Apr 2005 02:47:08 +0000 (19:47 -0700)

Steal -t option to git-ls-files from Cogito fork.

This backports the -t option git-ls-files in Cogito added to the Linus
version.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Implement -v (verbose) option for pull methods other... Junio C Hamano Fri, 6 May 2005 08:37:21 +0000 (01:37 -0700)

Implement -v (verbose) option for pull methods other than local transport.

This moves the private "say()" function to pull.c, renames it to
"pull_say()", and introduces a global variable "get_verbosely" that
makes the pull backends report what they fetch. The -v option is
added to git-rpull and git-http-pull to match git-local-pull.

The documentation is updated to describe these pull commands.

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

Add http and local transport support for git-pull-script.Junio C Hamano Fri, 6 May 2005 08:12:04 +0000 (01:12 -0700)

Add http and local transport support for git-pull-script.

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

Add documentation for the rest of commands.Junio C Hamano Fri, 6 May 2005 06:50:22 +0000 (23:50 -0700)

Add documentation for the rest of commands.

This adds descriptions for the core GIT commands that were not
mentioned in the previous version.

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

Adjust core-git documentation to more recent Linus... Junio C Hamano Fri, 6 May 2005 06:49:58 +0000 (23:49 -0700)

Adjust core-git documentation to more recent Linus GIT.

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

Reference documentation for the core git commands.David Greaves Fri, 6 May 2005 06:48:52 +0000 (23:48 -0700)

Reference documentation for the core git commands.

Signed-off-by: David Greaves <david@dgreaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge of http://members.cox.net/junkio/git-jc.gitLinus Torvalds Fri, 6 May 2005 01:30:18 +0000 (18:30 -0700)

Merge of http://members.cox.net/junkio/git-jc.git

[PATCH] create subdirs for symlinksKay Sievers Thu, 5 May 2005 23:34:10 +0000 (01:34 +0200)

[PATCH] create subdirs for symlinks

We may need to create subdirectories, before we can create a
symlink.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Be more careful about tree entry modes.Linus Torvalds Thu, 5 May 2005 23:18:48 +0000 (16:18 -0700)

Be more careful about tree entry modes.

The tree object parsing used to get the executable bit wrong,
and didn't know about symlinks. Also, fsck really wants the
full mode value so that it can verify the other bits for sanity,
so save it all in struct tree_entry.

Octopus merge of the following five patches.Junio C Hamano Thu, 5 May 2005 23:16:54 +0000 (16:16 -0700)

Octopus merge of the following five patches.

Update git-apply-patch-script for symbolic links.
Make git-prune-script executable again.
Do not write out new index if nothing has changed.
diff-cache shows differences for unmerged paths without --cache.
Update diff engine for symlinks stored in the cache.

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

Update git-apply-patch-script for symbolic links.Junio C Hamano Thu, 5 May 2005 23:14:01 +0000 (16:14 -0700)

Update git-apply-patch-script for symbolic links.

This patch updates the git-apply-patch-script for the symbolic links
in the cache, recently added by Kay Sievers.

It currently is very anal about symbolic link changes. It refuses to
change between a regular file and a symbolic link, and only allows
symbolic link changes if the patch is based on the same original.

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

Update diff engine for symlinks stored in the cache.Junio C Hamano Thu, 5 May 2005 23:10:21 +0000 (16:10 -0700)

Update diff engine for symlinks stored in the cache.

This patch updates the external diff interface engine for the change
to store the symbolic links in the cache, recently done by Kay
Sievers.

The main thing it does is when comparing with the work tree, it
prepares the counterpart to the blob being compared by doing a
readlink followed by sending that result to a temporary file to
be diffed.

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

Fix git-resolve-script.Linus Torvalds Thu, 5 May 2005 23:07:56 +0000 (16:07 -0700)

Fix git-resolve-script.

I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.

Fix symlink handlingLinus Torvalds Thu, 5 May 2005 23:01:46 +0000 (16:01 -0700)

Fix symlink handling

We really always want to have S_IFREG there for non-symlinks,
otherwise we create corrupt index files.

diff-cache shows differences for unmerged paths without... Junio C Hamano Thu, 5 May 2005 22:35:49 +0000 (15:35 -0700)

diff-cache shows differences for unmerged paths without --cache.

While manually resolving a merge conflict, being able to run
diff-cache without --cache option between files in the work tree
and either of the ancestor trees is helpful to verify the hand
merged result. However, diff-cache refuses to handle unmerged
paths, even when run without --cache option.

This changes the behaviour so that the above use case will
report the differences between the compared tree and the magic
0{40} SHA1 (i.e. "look at the work tree"). When there is no
corresponding file in the work tree, or when the command is run
with "--cache" option, it continues to report "unmerged".

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

Do not write out new index if nothing has changed.Junio C Hamano Thu, 5 May 2005 22:29:06 +0000 (15:29 -0700)

Do not write out new index if nothing has changed.

The git-update-cache command, especially with --refresh, may not change
anything. In such a case, writing 1.6MB of the same thing is a waste.

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

Make git-prune-script executable again.Junio C Hamano Thu, 5 May 2005 22:10:49 +0000 (15:10 -0700)

Make git-prune-script executable again.

I do not know why the executable bit was lost since the change went in as
GIT pull, not via e-mail patch, but here is a fix.

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

[PATCH] git: Mention the '-p' option in the usage help... Thomas Glanzmann Thu, 5 May 2005 19:51:34 +0000 (21:51 +0200)

[PATCH] git: Mention the '-p' option in the usage help string if git-diff-tree.

Mention the '-p' option in the usage help string of git-diff-tree.

Signed-Off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-Off-by: Linus Torvalds <torvalds@osdl.org>

Split "git-pull-script" into two partsLinus Torvalds Thu, 5 May 2005 18:43:30 +0000 (11:43 -0700)

Split "git-pull-script" into two parts

Separate out the merge resolve from the actual getting of the
data. Also, update the resolve phase to take advantage of the
fact that we don't need to do the commit->tree object lookup
by hand, since all the actors involved happily just act on a
commit object these days.

git-diff-cache: add "-m" flag to match all non-checked... Linus Torvalds Thu, 5 May 2005 16:31:09 +0000 (09:31 -0700)

git-diff-cache: add "-m" flag to match all non-checked-out files with the index.

This allows you to work with a directory tree that isn't fully populated,
without making diff-cache say that all the files are gone.

[PATCH] git and symlinks as tracked contentKay Sievers Thu, 5 May 2005 12:38:25 +0000 (14:38 +0200)

[PATCH] git and symlinks as tracked content

Allow to store and track symlink in the repository. A symlink is stored
the same way as a regular file, only with the appropriate mode bits set.
The symlink target is therefore stored in a blob object.
This will hopefully make our udev repository fully functional. :)

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Fix git rpush.Anton Altaparmakov Thu, 5 May 2005 12:31:53 +0000 (13:31 +0100)

[PATCH] Fix git rpush.

Following up from my fix to rpull, please also apply this, which fixes
rpush.c to call git-rpull rather than rpull which no longer exists after
the Big Rename(TM)...

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] Fix git rpull.Anton Altaparmakov Thu, 5 May 2005 11:30:25 +0000 (12:30 +0100)

[PATCH] Fix git rpull.

This fixes rpull.c to call git-rpush rather than rpush which no longer
exists after the Big Rename(TM)...

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

git-pull-script: do the diffstat also for the fast... Linus Torvalds Thu, 5 May 2005 09:21:42 +0000 (02:21 -0700)

git-pull-script: do the diffstat also for the fast-forward case

This way you always see what the state change was.

Merge http://members.cox.net/junkio/git-jc.git/Linus Torvalds Thu, 5 May 2005 01:18:40 +0000 (18:18 -0700)

Merge http://members.cox.net/junkio/git-jc.git/

Make "git-prune-script" take all refs into account.Linus Torvalds Thu, 5 May 2005 00:26:41 +0000 (17:26 -0700)

Make "git-prune-script" take all refs into account.

This avoids pruning the kernel v2.6.11 tree that now has a tag.

Teach fsck-cache to accept non-commits for reachability... Linus Torvalds Thu, 5 May 2005 00:03:09 +0000 (17:03 -0700)

Teach fsck-cache to accept non-commits for reachability analysis.

In particular, teach it about tags. Also, to make reachability actually
work for tags, we need to add the ref to the tagged object.

Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds Thu, 5 May 2005 00:02:16 +0000 (17:02 -0700)

Teach "git-pull-script" about alternate HEAD's to pull..

People are already starting to use a multi-head model.

[PATCH] Fix memory leaks in git-fsck-cacheSergey Vlasov Wed, 4 May 2005 17:44:15 +0000 (21:44 +0400)

[PATCH] Fix memory leaks in git-fsck-cache

This patch fixes memory leaks in parse_object() and related functions;
these leaks were very noticeable when running git-fsck-cache.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When the patch tries to create a new file and the file... Junio C Hamano Wed, 4 May 2005 17:45:36 +0000 (10:45 -0700)

When the patch tries to create a new file and the file exists, abort.

This fixes an error introduced to git-apply-patch-script in the previous
round. We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.

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

git-pull-script: add a final "diffstat" to show the... Linus Torvalds Wed, 4 May 2005 14:12:18 +0000 (07:12 -0700)

git-pull-script: add a final "diffstat" to show the result of the merge.

This is useful to verify that you got the right thing.

Optimize diff-cache -p --cachedJunio C Hamano Wed, 4 May 2005 08:45:24 +0000 (01:45 -0700)

Optimize diff-cache -p --cached

This patch optimizes "diff-cache -p --cached" by avoiding to
inflate blobs into temporary files when the blob recorded in the
cache matches the corresponding file in the work tree. The file
in the work tree is passed as the comparison source in such a
case instead.

This optimization kicks in only when we have already read the
cache this optimization and this is deliberate. Especially,
diff-tree does not use this code, because changes are contained
in small number of files relative to the project size most of
the time, and reading cache is so expensive for a large project
that the cost of reading it outweighs the savings by not
inflating blobs.

Also this patch cleans up the structure passed from diff clients
by removing one unused structure member.

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

Terminate diff-* on non-zero exit from GIT_EXTERNAL_DIFFJunio C Hamano Wed, 4 May 2005 08:38:06 +0000 (01:38 -0700)

Terminate diff-* on non-zero exit from GIT_EXTERNAL_DIFF

(slightly updated from the version posted to the GIT mailing list
with small bugfixes).

This patch changes the git-apply-patch-script to exit non-zero when
the patch cannot be applied. Previously, the external diff driver
deliberately ignored the exit status of GIT_EXTERNAL_DIFF command,
which was a design mistake. It now stops the processing when
GIT_EXTERNAL_DIFF exits non-zero, so the damages from running
git-diff-* with git-apply-patch-script between two wrong trees can be
contained.

The "diff" command line generated by the built-in driver is changed to
always exit 0 in order to match this new behaviour. I know Pasky does
not use GIT_EXTERNAL_DIFF yet, so this change should not break Cogito,
either.

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

Git-prune-script loses blobs referenced from an uncommi... Junio C Hamano Wed, 4 May 2005 08:33:33 +0000 (01:33 -0700)

Git-prune-script loses blobs referenced from an uncommitted cache.

(updated from the version posted to GIT mailing list).

When a new blob is registered with update-cache, and before the cache
is written as a tree and committed, git-fsck-cache will find the blob
unreachable. This patch adds a new flag, "--cache" to git-fsck-cache,
with which it keeps such blobs from considered "unreachable".

The git-prune-script is updated to use this new flag. At the same time
it adds .git/refs/*/* to the set of default locations to look for heads,
which should be consistent with expectations from Cogito users.

Without this fix, "diff-cache -p --cached" after git-prune-script has
pruned the blob object will fail mysteriously and git-write-tree would
also fail.

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

Short-cut error return path in git-local-pull.Junio C Hamano Wed, 4 May 2005 08:28:45 +0000 (01:28 -0700)

Short-cut error return path in git-local-pull.

When git-local-pull with -l option gets ENOENT attempting to create
a hard link, there is no point falling back to other copy methods.
With this patch, git-local-pull detects such a case and gives up
copying the file early.

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

Make git-*-pull say who wants them for missing objects.Junio C Hamano Wed, 4 May 2005 08:26:24 +0000 (01:26 -0700)

Make git-*-pull say who wants them for missing objects.

This patch updates pull.c, the engine that decides which objects are
needed, given a commit to traverse from, to report which commit was
calling for the object that cannot be retrieved from the remote side.
This complements git-fsck-cache in that it checks the consistency of
the remote repository for reachability.

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

sha1_file: make the new sha1 object writing be coda... Linus Torvalds Tue, 3 May 2005 22:16:18 +0000 (15:16 -0700)

sha1_file: make the new sha1 object writing be coda-friendly.

Coda doesn't like cross-directory hardlinks. So try to fall back
on a plain rename instead.

Improve sha1 object file writing.Linus Torvalds Tue, 3 May 2005 18:46:16 +0000 (11:46 -0700)

Improve sha1 object file writing.

Make it much safer: we write to a temporary file, and then link that
temporary file to the final destination. This avoids all the nasty
races if several people write the same object at the same time.

It should also result in nicer on-disk layout, since it means that
objects all get created in the same subdirectory. That makes a lot
of block allocation algorithms happier, since the objects will now
be allocated from the same zone.

fsck-cache: fix SIGSEGV on bad tag objectLinus Torvalds Tue, 3 May 2005 14:57:56 +0000 (07:57 -0700)

fsck-cache: fix SIGSEGV on bad tag object

fsck_tag() failes to notice that the parsing of the tag may
have failed in the parse_object() call on the object that it
is tagging.

Noticed by Junio.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Automatic merge of /home/torvalds/junkio/.git/Linus Torvalds Tue, 3 May 2005 14:30:10 +0000 (07:30 -0700)

Automatic merge of /home/torvalds/junkio/.git/

fsck-cache: report broken links correctlyLinus Torvalds Tue, 3 May 2005 04:10:54 +0000 (21:10 -0700)

fsck-cache: report broken links correctly

We reported the type of te missing object incorrectly: we reported it as
the type of the referrer object, not the object that was referred to.

Make fsck-cache do better tree checking.Linus Torvalds Mon, 2 May 2005 23:13:18 +0000 (16:13 -0700)

Make fsck-cache do better tree checking.

We check the ordering of the entries, and we verify that none
of the entries has a slash in it (this allows us to remove the
hacky "has_full_path" member from the tree structure, since we
now just test it by walking the tree entries instead).

[PATCH] Fix warning in convert-cachetony.luck@intel.com Mon, 2 May 2005 17:57:02 +0000 (10:57 -0700)

[PATCH] Fix warning in convert-cache

gcc 3.4.3 kicks out this warning:
convert-cache.c: In function `write_subdirectory':
convert-cache.c:102: warning: field precision is not type int (arg 4)

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fsck-cache: sort entries by inode numberLinus Torvalds Mon, 2 May 2005 16:06:33 +0000 (09:06 -0700)

fsck-cache: sort entries by inode number

This improves the cold-cache behaviour on most filesystems,
since it makes the fsck access patterns more regular on
the disk, rather than seeking back and forth.

Note the "most". Not all filesystems have any relationship
between inode number and location on disk.

Update git-merge-one-file-script.Junio C Hamano Mon, 2 May 2005 06:53:32 +0000 (23:53 -0700)

Update git-merge-one-file-script.

With this change, git-merge-one-file-script ceases to smudge
files in the work tree when recording the trivial merge results
(conflicting auto-merge failure case does not touch the work
tree file as before).

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

Implement git-update-cache --force-remove <path>Junio C Hamano Mon, 2 May 2005 06:50:51 +0000 (23:50 -0700)

Implement git-update-cache --force-remove <path>

This new flag tells git-update-cache to remove the named path even
when the work tree still happens to have the file. It is used to
update git-merge-one-file-script not to smudge the work tree.

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