git.git
19 years ago[PATCH] Implement git-checkout-cache -u to update stat information in the cache.
Junio C Hamano [Sun, 15 May 2005 21:23:12 +0000 (14:23 -0700)]
[PATCH] Implement git-checkout-cache -u to update stat information in the cache.

With -u flag, git-checkout-cache picks up the stat information
from newly created file and updates the cache.  This removes the
need to run git-update-cache --refresh immediately after running
git-checkout-cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agodiff.c: remove left-over scoring debug message
Linus Torvalds [Thu, 19 May 2005 16:20:00 +0000 (09:20 -0700)]
diff.c: remove left-over scoring debug message

It may be wonderful for rating the scoring, but it's
not appropriate for actual use ;)

19 years agogit-whatchanged: use 'less -S' on the output to make it more user friendly
Linus Torvalds [Thu, 19 May 2005 16:07:19 +0000 (09:07 -0700)]
git-whatchanged: use 'less -S' on the output to make it more user friendly

19 years ago[PATCH] Detect renames in diff family.
Junio C Hamano [Thu, 19 May 2005 10:32:35 +0000 (03:32 -0700)]
[PATCH] Detect renames in diff family.

This rips out the rename detection engine from diff-helper and moves it
to the diff core, and updates the internal calling convention used by
diff-tree family into the diff core.  In order to give the same option
name to diff-tree family as well as to diff-helper, I've changed the
earlier diff-helper '-r' option to '-M' (stands for Move; sorry but the
natural abbreviation 'r' for 'rename' is already taken for 'recursive').

Although I did a fair amount of test with the git-diff-tree with
existing rename commits in the core GIT repository, this should still be
considered beta (preview) release.  This patch depends on the diff-delta
infrastructure just committed.

This implements almost everything I wanted to see in this series of
patch, except a few minor cleanups in the calling convention into diff
core, but that will be a separate cleanup patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Deltification library work by Nicolas Pitre.
Nicolas Pitre [Thu, 19 May 2005 14:27:14 +0000 (10:27 -0400)]
[PATCH] Deltification library work by Nicolas Pitre.

This patch adds the basic library functions to create and replay delta
information.  Also included is a test-delta utility to validate the
code.

diff-delta was based on LibXDiff written by Davide Libenzi

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] A test case addition for strbuf regression
Junio C Hamano [Thu, 19 May 2005 06:55:07 +0000 (23:55 -0700)]
[PATCH] A test case addition for strbuf regression

This test would have caught the strbuf eof condition gotcha,
hopefully fixed with my previous patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] fix strbuf take #2
Junio C Hamano [Thu, 19 May 2005 06:34:03 +0000 (23:34 -0700)]
[PATCH] fix strbuf take #2

I just remembered why I placed that bogus "sb->len ==0 implies
sb->eof" condition there.  We need at least something like this
to catch the normal EOF (that is, line termination immediately
followed by EOF) case.  "if (feof(fp))" fires when we have
already read the eof, not when we are about read it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agomerge-base: use the new lookup_commit_reference() helper function
Linus Torvalds [Wed, 18 May 2005 23:16:51 +0000 (16:16 -0700)]
merge-base: use the new lookup_commit_reference() helper function

This allows you to use tags for merge bases.

19 years agocommit: add "lookup_commit_reference()" helper function
Linus Torvalds [Wed, 18 May 2005 23:14:22 +0000 (16:14 -0700)]
commit: add "lookup_commit_reference()" helper function

It's pretty much the same as "lookup_commit()", but it will take
tags too, and look up the commit (if any) associated with them.

19 years ago[PATCH] fix show_date() for positive timezones
Nicolas Pitre [Wed, 18 May 2005 21:11:07 +0000 (17:11 -0400)]
[PATCH] fix show_date() for positive timezones

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agodiff-tree: don't match non-directories as partial pathnames
Linus Torvalds [Wed, 18 May 2005 21:17:22 +0000 (14:17 -0700)]
diff-tree: don't match non-directories as partial pathnames

This normally doesn't matter, but if you have a filename that is
sometimes a directory and sometimes a regular file (or symlink),
we don't want the regular file case to trigger a "partial match".

19 years agodiff-tree: fix "whole sub-tree disappeared or appeared" case
Linus Torvalds [Wed, 18 May 2005 21:07:42 +0000 (14:07 -0700)]
diff-tree: fix "whole sub-tree disappeared or appeared" case

We still need to check which part of the sub-tree is interesting.

19 years agodiff-tree: fix up comparison of "interesting" sub-trees
Linus Torvalds [Wed, 18 May 2005 20:50:24 +0000 (13:50 -0700)]
diff-tree: fix up comparison of "interesting" sub-trees

We used to trigger the "interesting subdirectory" check for any
matching name that started with the same character series, regardless
of whether it had the matching slash or not.

19 years agodiff-tree: show hex sha1 of the single-commit argument case correctly.
Linus Torvalds [Wed, 18 May 2005 20:43:58 +0000 (13:43 -0700)]
diff-tree: show hex sha1 of the single-commit argument case correctly.

We can't just do the "sha1_to_hex()" thing directly, since the
buffer in question will be overwritten by the name of the parent.

So teach diff_tree_commit() to generate the proper hex name itself.

19 years agodiff-tree: fix and extend argument parsing
Linus Torvalds [Wed, 18 May 2005 20:10:17 +0000 (13:10 -0700)]
diff-tree: fix and extend argument parsing

We use "--" to mark end of command line switches, not "-". Also,
allow more flexibility in the passed-in sha1 names, in that a
single sha1 uses the "commit-diff" logic that compares against
its parent(s).

19 years agodiff-tree: clean up diff_tree_stdin() function
Linus Torvalds [Wed, 18 May 2005 20:06:47 +0000 (13:06 -0700)]
diff-tree: clean up diff_tree_stdin() function

Split it into the "one commit" vs "two trees" case, since we'll
want to use the "one commit" case for other things too.

19 years agodiff-helper: pass unrecognized lines through unmodified
Linus Torvalds [Wed, 18 May 2005 18:33:46 +0000 (11:33 -0700)]
diff-helper: pass unrecognized lines through unmodified

(and flush any pending renames)

19 years agostrbuf: allow zero-length lines
Linus Torvalds [Wed, 18 May 2005 18:33:06 +0000 (11:33 -0700)]
strbuf: allow zero-length lines

They aren't EOF.

19 years ago[PATCH] Diff-helper update
Junio C Hamano [Wed, 18 May 2005 06:29:49 +0000 (23:29 -0700)]
[PATCH] Diff-helper update

This patch adds a framework and a stub implementation of rename
detection to diff-helper program.

The current stub code is just enough to detect pure renames in
diff-tree output and not fancier.  The plan is perhaps to use
the same delta code when Nico's delta storage patch is merged
for similarity evaluation purposes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agofsck-cache: read the default reference information even when
Linus Torvalds [Wed, 18 May 2005 17:19:59 +0000 (10:19 -0700)]
fsck-cache: read the default reference information even when
not doing reachability analysis.

This avoids the dangling head problem, and means that just a
plain "git-fsck-cache" with no parameters will DTRT.

19 years agofsck-cache: walk the 'refs' directory if the user doesn't give any
Linus Torvalds [Wed, 18 May 2005 17:16:14 +0000 (10:16 -0700)]
fsck-cache: walk the 'refs' directory if the user doesn't give any
explicit references for reachability analysis.

We already had that as separate logic in git-prune-script, so this
is not a new special case - it's an old special case moved into
fsck, making normal usage be much simpler.

19 years ago[PATCH] Fix diff output take #4.
Junio C Hamano [Wed, 18 May 2005 16:10:47 +0000 (09:10 -0700)]
[PATCH] Fix diff output take #4.

This implements the output format suggested by Linus in
<Pine.LNX.4.58.0505161556260.18337@ppc970.osdl.org>, except the
imaginary diff option is spelled "diff --git" with double dashes as
suggested by Matthias Urlichs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Kill a bunch of pointer sign warnings for gcc4
Brian Gerst [Wed, 18 May 2005 12:14:09 +0000 (08:14 -0400)]
[PATCH] Kill a bunch of pointer sign warnings for gcc4

 - Raw hashes should be unsigned char.
 - String functions want signed char.
 - Hash and compress functions want unsigned char.

Signed-off By: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd silly "git-whatchanged" script.
Linus Torvalds [Tue, 17 May 2005 18:47:13 +0000 (11:47 -0700)]
Add silly "git-whatchanged" script.

It's a one-liner, but it's useful as documentation if nothing else.

19 years ago[PATCH 4/4] Trivial test harness fixes.
Junio C Hamano [Sun, 15 May 2005 21:21:13 +0000 (14:21 -0700)]
[PATCH 4/4] Trivial test harness fixes.

The documentation of the test harness still refer to old
numbering and also contains an obvious typo.

Also "make test" should be run after making sure we have built
all binaries, since test is designed to test the newly built
ones.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoRemove obsolete note about native CPU byte format
Petr Baudis [Sun, 15 May 2005 10:38:55 +0000 (12:38 +0200)]
Remove obsolete note about native CPU byte format

Comment in entry.h said that the cache contents is in the native CPU
byte format, which is really not true anymore for quite some time.

19 years agoRename some more cache-related functions
Brad Roberts [Sun, 15 May 2005 02:04:25 +0000 (19:04 -0700)]
Rename some more cache-related functions

same_name -> ce_same_name()
remove_entry_at() -> remove_cache_entry_at()

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoRename cache_match_stat() to ce_match_stat()
Brad Roberts [Sun, 15 May 2005 02:04:25 +0000 (19:04 -0700)]
Rename cache_match_stat() to ce_match_stat()

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoCleanup the x-allocation functions
Brad Roberts [Sun, 15 May 2005 02:04:25 +0000 (19:04 -0700)]
Cleanup the x-allocation functions

xmalloc() and xrealloc() now take their sizes as size_t-type arguments.
Introduced complementary xcalloc().

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).
Junio C Hamano [Sat, 14 May 2005 01:41:36 +0000 (18:41 -0700)]
[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).

It used to be that diff-tree needed helper support to parse its
raw output to generate diffs, but these days git-diff-* family
produces the same output and the helper is not tied to diff-tree
anymore.  Drop "tree" from its name.

This follows the "rename only" commit to adjust the contents of
the files involved.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.
Junio C Hamano [Sat, 14 May 2005 01:40:54 +0000 (18:40 -0700)]
[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.

It used to be that diff-tree needed helper support to parse its
raw output to generate diffs, but these days git-diff-* family
produces the same output and the helper is not tied to diff-tree
anymore.  Drop "tree" from its name.

This commit is done separately to record just the rename and no
file content changes. The changes in the renamed files are recorded
in the next commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Bundled with the changes in the unrenamed files.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoThe test of the basic diff functionality
Junio C Hamano [Sat, 14 May 2005 05:52:42 +0000 (22:52 -0700)]
The test of the basic diff functionality

This test comes from "[PATCH 2/2] The core GIT tests: recent additions and
fixes" but couldn't be included before since it depended on the modechange
diff output changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 1/3] Update mode-change strings in diff output.
Junio C Hamano [Sat, 14 May 2005 01:40:14 +0000 (18:40 -0700)]
[PATCH 1/3] Update mode-change strings in diff output.

This updates the mode change strings to be a bit more machine
friendly.  Although this might go against the spirit of
readability for human consumption, these mode bits strings are
shown only when unusual things (mode change, file creation and
deletion) happens, output normalized for machine consumption
would be permissible.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH] Add the merge test Linus called "test script from hell".
Junio C Hamano [Sat, 14 May 2005 08:46:46 +0000 (01:46 -0700)]
[PATCH] Add the merge test Linus called "test script from hell".

This is an adaptation to the test framework of a historic test
that was used before three way merge form of read-tree was
introduced, and subsequently used to validate the read-tree -m
merge works correctly.  It covers all the tricky cases known
back then and also have been updated to cover conflicting
files/directories cases since then.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoFixed misnamed t/t2010-update-cache-badpath.sh
Petr Baudis [Sat, 14 May 2005 23:42:31 +0000 (01:42 +0200)]
Fixed misnamed t/t2010-update-cache-badpath.sh

mv t/t2010-update-cache-badpath.sh t/t2100-update-cache-badpath.sh

19 years ago[PATCH] Test GIT environment use.
Junio C Hamano [Sat, 14 May 2005 08:45:42 +0000 (01:45 -0700)]
[PATCH] Test GIT environment use.

This test makes sure that use of deprecated environment variables still
works, using both new and old names makes new one take
precedence, and GIT_DIR and GIT_ALTERNATE_OBJECT_DIRECTORIES mechanisms
work.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoRename some test scripts and describe the naming convention
Petr Baudis [Sat, 14 May 2005 23:34:22 +0000 (01:34 +0200)]
Rename some test scripts and describe the naming convention

First digit: "family", e.g. the absolute basics and global stuff (0),
the basic db-side commands (read-tree, write-tree, commit-tree), the
basic working-tree-side commands (checkout-cache, update-cache), the
other basic commands (ls-files), the diff commands, the pull commands,
exporting commands, revision tree commands...

Second digit: the particular command we are testing

Third digit: (optionally) the particular switch or group of switches
we are testing

Freeform part: commandname-details

Described in the README.

mv t1000-checkout-cache.sh t2000-checkout-cache-clash.sh
mv t1001-checkout-cache.sh t2001-checkout-cache-clash.sh
mv t0200-update-cache.sh t2010-update-cache-badpath.sh
mv t0400-ls-files.sh t3000-ls-files-others.sh
mv t0500-ls-files.sh t3010-ls-files-killed.sh

19 years ago[PATCH 2/2] Test framework documentation.
Junio C Hamano [Sat, 14 May 2005 07:25:06 +0000 (00:25 -0700)]
[PATCH 2/2] Test framework documentation.

This adds instruction for running tests, and writing new tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Updated to the new tidied up output style.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 1/2] Test suite fixup.
Junio C Hamano [Sat, 14 May 2005 07:24:27 +0000 (00:24 -0700)]
[PATCH 1/2] Test suite fixup.

Exposing test_expect_success and test_expect_failure turns out
to be enough for the test scripts and there is no need for
exposing test_ok or test_failure.  This patch cleans it up and
fixes the users of test_ok and test_failure.

Also test scripts have acquired a new command line flag
'--immediate' to cause them to exit upon the first failure.
This is useful especially during the development of a new test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoTry to make test output look better
Petr Baudis [Sat, 14 May 2005 16:01:30 +0000 (18:01 +0200)]
Try to make test output look better

NO changed to FAIL and ok was right-aligned with it so that it is easier
to visually identify the failed tests, and the removal of # should reduce
the clutter on the line and aid the eye to spot the test number better.

19 years agot/Makefile: OPTS -> GIT_TEST_OPTS
Petr Baudis [Sat, 14 May 2005 15:58:22 +0000 (17:58 +0200)]
t/Makefile: OPTS -> GIT_TEST_OPTS

This way, passing this variable through the environment actually makes
sense.

19 years agot/Makefile cleanup
Petr Baudis [Sat, 14 May 2005 15:57:32 +0000 (17:57 +0200)]
t/Makefile cleanup

t/Makefile now does not use double-colon rules (why would it?), the rm
-fr trash in the all rule is silent, and OPTS aren't set to blank so
that they can be taken from the environment.

19 years agoImplemented make test
Petr Baudis [Sat, 14 May 2005 15:45:33 +0000 (17:45 +0200)]
Implemented make test

make test in project root will recurse to the t/ subdirectory and run
make all there.

19 years agoFixed t0000-basic.sh and test-lib.sh permissions
Petr Baudis [Sat, 14 May 2005 15:42:02 +0000 (17:42 +0200)]
Fixed t0000-basic.sh and test-lib.sh permissions

The +x bit was missing. I applied the original patch three times and set
the permissions correctly two times. Guess which was the time I forgot.

19 years ago[PATCH 2/2] The core GIT tests: recent additions and fixes.
Junio C Hamano [Sat, 14 May 2005 05:52:42 +0000 (22:52 -0700)]
[PATCH 2/2] The core GIT tests: recent additions and fixes.

This set of scripts are designed to test the features and fixes
we recently added to core GIT.  The convention to call test
helper function has been changed during the framework cleanup
(take two), and these tests have been updated to use the cleaned
up test-lib.sh interface.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Note that this does not include the t2000-diff.sh script since it
tests a patch which was not applied yet.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 1/2] Test framework take two.
Junio C Hamano [Sat, 14 May 2005 05:50:32 +0000 (22:50 -0700)]
[PATCH 1/2] Test framework take two.

This adds t/ directory to host test suite, a test helper
library and a basic set of tests.

Petr Baudis raised many valid points at the earlier attempts in
git mailing list.  This round, test-lib.sh has been updated to a
bit more modern style, and the default output is made easier to
read.  Also included is one sample test script that tests the
very basics.  This test has already found one leftover bug
missed when we introduced symlink support, which has been fixed
since then.  The supplied Makefile is designed to run all the
available tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH] Fix git-diff-files for symlinks.
Junio C Hamano [Thu, 12 May 2005 23:51:08 +0000 (16:51 -0700)]
[PATCH] Fix git-diff-files for symlinks.

Again I am not sure why this was missed during the last round,
but git-diff-files mishandles symlinks on the filesystem.  This
patch fixes it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
And I'm not sure why did I miss this patch before. Sorry.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoThe Makefile is now aware of Documentation/ include directives
David Greaves [Thu, 12 May 2005 21:31:05 +0000 (22:31 +0100)]
The Makefile is now aware of Documentation/ include directives

It makes the includers (diff commands documentation) depend on the includee
(diff format description).

Signed-off-by: David Greaves <david@dgreaves.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 3/3] Add git-ls-files -k.
Junio C Hamano [Fri, 13 May 2005 00:17:54 +0000 (17:17 -0700)]
[PATCH 3/3] Add git-ls-files -k.

When checkout-cache attempts to check out a non-directory where
a directory exists on the work tree, or to check out a file
under directory D when path D is a non-directory on the work
tree, the attempt fails.  Before running checkout-cache, the
user can run git-ls-files with the -k (killed) option to get a
list of such paths.  The tagged output format uses "K" to denote
them.  This is useful for Porcelain layer to be careful when
dealing with the recently corrected behaviour of checkout-cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH 2/3] Support symlinks in git-ls-files --others.
Junio C Hamano [Fri, 13 May 2005 00:16:04 +0000 (17:16 -0700)]
[PATCH 2/3] Support symlinks in git-ls-files --others.

It is kind of surprising that this was missed in the last round,
but the work tree scanner in git-ls-files was still deliberately
ignoring symlinks.  This patch fixes it, so that --others will
correctly report unregistered symlinks.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[PATCH] checkout-cache fix
Junio C Hamano [Thu, 12 May 2005 00:02:45 +0000 (17:02 -0700)]
[PATCH] checkout-cache fix

Fix checkout-cache when existing work tree interferes with the checkout.

This is essentially the same one as the last one I sent to the
GIT list, except that the patch is rebased to the current tip of
the git-pb tree, and an unnecessary call to create_directories()
removed.

The checkout-cache command gets confused when checking out a
file in a subdirectory and the work tree has a symlink to the
subdirectory.  Also it fails to check things out when there is a
non-directory in the work tree when cache expects a directory
there, and vice versa.  This patch fixes the first problem by
making sure all the leading paths in the file being checked out
are indeed directories, and also fixes directory vs
non-directory conflicts when '-f' is specified by removing the
offending paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoFixed a leak in read-tree
Petr Baudis [Wed, 11 May 2005 21:16:23 +0000 (23:16 +0200)]
Fixed a leak in read-tree

unpack_tree() would not free the tree object it has read.

19 years ago[patch] git: cleanup in ls-tree.c
Ingo Molnar [Thu, 14 Apr 2005 10:43:44 +0000 (12:43 +0200)]
[patch] git: cleanup in ls-tree.c

cleanup: this patch adds a free() to ls-tree.c.

(Technically it's not a memory leak yet because the buffer is allocated
once by the function and then the utility exits - but it's a tad cleaner
to not leave such assumptions in the code, so that if someone reuses the
function (or extends the utility to include a loop) the uncleanliness
doesnt develop into a real memory leak.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Forward-ported.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years ago[patch] git: fix memory leak #2 in checkout-cache.c
Ingo Molnar [Thu, 14 Apr 2005 10:35:27 +0000 (12:35 +0200)]
[patch] git: fix memory leak #2 in checkout-cache.c

this patch fixes another (very rare) memory leak in checkout-cache.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agorev-tree now handles commit problems better
Petr Baudis [Wed, 11 May 2005 21:01:20 +0000 (23:01 +0200)]
rev-tree now handles commit problems better

This fixes possible crashes in case of broken commit tree, and makes
rev-tree die in case it cannot parse a given commit.

19 years ago[PATCH] read_tree_recursive(): Fix leaks
Jonas Fonseca [Tue, 26 Apr 2005 22:00:01 +0000 (00:00 +0200)]
[PATCH] read_tree_recursive(): Fix leaks

Fix two potential leaks.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoStick a comment to update-cache.c:refresh_cache() that you can't
Petr Baudis [Sun, 17 Apr 2005 21:34:51 +0000 (23:34 +0200)]
Stick a comment to update-cache.c:refresh_cache() that you can't
just free(archive_cache[i]) when replacing it there.

19 years ago[patch] git: fix overflow in update-cache.c
Ingo Molnar [Thu, 14 Apr 2005 11:18:19 +0000 (13:18 +0200)]
[patch] git: fix overflow in update-cache.c

this patch fixes a 1-byte overflow in update-cache.c (probably not
exploitable). A specially crafted db object might trigger this overflow.

the bug is that normally the 'type' field is parsed by read_sha1_file(),
via:

if (sscanf(buffer, "%10s %lu", type, size) != 2)

i.e. 0-10 long strings, which take 1-11 bytes of space. Normally the
type strings are stored in char [20] arrays, but in update-cache.c that
is char [10], so a 1 byte overflow might occur.

This should not happen with a 'friendly' DB, as the longest type string
("commit") is 7 bytes long. The fix is to use the customary char [20].

(someone might want to clean those open-coded constants up with a
TYPE_LEN define, they do tend to cause problems like this. I'm not
against open-coded constants (they make code much more readable), but
for fields that get filled in from possibly hostile objects this is
playing with fire.)

hey, this might be the first true security fix for GIT? ;-)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
19 years agoMake update-cache be explicit about failed open() when doing
Petr Baudis [Tue, 26 Apr 2005 19:04:55 +0000 (21:04 +0200)]
Make update-cache be explicit about failed open() when doing
add_file_to_cache().

19 years agoAdjust quoting styles for some environment variables in the documentation.
Junio C Hamano [Wed, 11 May 2005 03:54:57 +0000 (20:54 -0700)]
Adjust quoting styles for some environment variables in the documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDocument git-merge-cache -o
Petr Baudis [Wed, 11 May 2005 02:49:36 +0000 (04:49 +0200)]
Document git-merge-cache -o

19 years agogit-merge-cache -o does all the automerges in a single shot
Petr Baudis [Wed, 11 May 2005 02:44:59 +0000 (04:44 +0200)]
git-merge-cache -o does all the automerges in a single shot

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.

19 years agoMore README spelling fixes
Petr Baudis [Wed, 11 May 2005 00:15:14 +0000 (02:15 +0200)]
More README spelling fixes

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

19 years agoSpelling 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>
19 years ago[PATCH] Misc fixes for git-pasky
Pavel 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>
19 years agoMerge with http://members.cox.net/junkio/git-jc.git
Petr Baudis [Wed, 11 May 2005 00:00:49 +0000 (02:00 +0200)]
Merge ... http://members.cox.net/junkio/git-jc.git

19 years agoMark the variable declarations in .h files as extern
Petr 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.

19 years ago[PATCH 4/4] split core-git.txt and update
David 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>
19 years ago[PATCH 3/4] split core-git.txt and update
David 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>
19 years ago[PATCH 2/4] split core-git.txt and update
David 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>
19 years ago[PATCH 1/4] split core-git.txt and update
David 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>
19 years agoLink with -lcrypto instead of -lssl when using openssl libraries.
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>
19 years agoDo not report size of the object that cannot be written in local-pull.c
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>
19 years agoIntroduce 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>
19 years agoRename 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>
19 years agoAdd copyright notice of Rene Scharfe to tar-tree.c
Petr Baudis [Mon, 9 May 2005 21:33:02 +0000 (23:33 +0200)]
Add copyright notice of Rene Scharfe to tar-tree.c

19 years agoFix 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>
19 years ago[PATCH 2/2] core-git documentation update
David 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>
19 years agoA stylistic fix to read-cache.c
Junio 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>
19 years agoStylistic fixes to sha1_file.c
Junio 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>
19 years ago[PATCH 1/2] core-git documentation update
David 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>
19 years ago[PATCH] Really *do* nothing in while loop
Thomas 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>
19 years agowrite-tree is now willing to write empty tree
Petr 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.

19 years agoAllow 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>
19 years agoAdd 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>
19 years agogit-update-cache refuses to add a file where a directory is registed.
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>
19 years agoBuild and install git-get-tar-commit-id
Junio 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>
19 years agoNotice 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>
19 years ago[PATCH] make INSTALL binary in Makefile configurable via make variable
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>
19 years ago[PATCH] Add #include <limits.h> so that git compiles under Solaris
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>
19 years agoUse backticks in git-merge-one-file-script instead of $(command).
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>
19 years agoNotice index that has path and path/file and refuse to write such a tree.
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>
19 years agoMake merge-cache not fail immediatelly when the merge program
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.

19 years agoDate: Thu Apr 14 08:26:38 2005 +0200
Ingo 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>
19 years agoFree 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>
19 years agoFix usage string of git-diff-cache and add documentation of -m flag.
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>
19 years agoFix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.
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>
19 years agoIntroduce SHA1_FILE_DIRECTORIES to support multiple object databases.
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>
19 years ago[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>
19 years ago[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>