git/git.git
15 years ago[PATCH] Diffcore updates.
Junio C Hamano [Sun, 22 May 2005 17:04:37 +0000 (10:04 -0700)]
[PATCH] Diffcore updates.

This moves the path selection logic from individual programs to a new
diffcore transformer (diff-tree still needs to have its own for
performance reasons).  Also the header printing code in diff-tree was
tweaked not to produce anything when pickaxe is in effect and there is
nothing interesting to report.  An interesting example is the following
in the GIT archive itself:

    $ git-whatchanged -p -C -S'or something in a real script'

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Add the code to set default minimum score back in.
Junio C Hamano [Sun, 22 May 2005 06:33:32 +0000 (23:33 -0700)]
[PATCH] Add the code to set default minimum score back in.

When the minimum score is specified as 0 (meaning "use default
value"), set it to the default as we are told.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Fix tweak in similarity estimator.
Junio C Hamano [Sun, 22 May 2005 08:31:28 +0000 (01:31 -0700)]
[PATCH] Fix tweak in similarity estimator.

There was a screwy math bug in the estimator that confused what
-C1 meant and what -C9 meant, only in one of the early "cheap"
check, which resulted in quite confusing behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] The diff-raw format updates.
Junio C Hamano [Sun, 22 May 2005 02:42:18 +0000 (19:42 -0700)]
[PATCH] The diff-raw format updates.

Update the diff-raw format as Linus and I discussed, except that
it does not use sequence of underscore '_' letters to express
nonexistence.  All '0' mode is used for that purpose instead.

The new diff-raw format can express rename/copy, and the earlier
restriction that -M and -C _must_ be used with the patch format
output is no longer necessary.  The patch makes -M and -C flags
independent of -p flag, so you need to say git-whatchanged -M -p
to get the diff/patch format.

Updated are both documentations and tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Prepare diffcore interface for diff-tree header supression.
Junio C Hamano [Sun, 22 May 2005 02:40:36 +0000 (19:40 -0700)]
[PATCH] Prepare diffcore interface for diff-tree header supression.

This does not actually supress the extra headers when pickaxe is
used, but prepares enough support for diff-tree to implement it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Tweak diffcore-rename heuristics.
Junio C Hamano [Sat, 21 May 2005 22:55:18 +0000 (15:55 -0700)]
[PATCH] Tweak diffcore-rename heuristics.

The heuristics so far was to compare file size change and xdelta
size against the average of file size before and after the
change.  This patch uses the smaller of pre- and post- change
file size instead.

It also makes a very small performance fix.  I didn't measure
it; I do not expect it to make any practical difference, but
while scanning an already sorted list, breaking out in the
middle is the right thing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agodiff-tree: don't print multiple headers for merges when silent.
Linus Torvalds [Sat, 21 May 2005 22:42:53 +0000 (15:42 -0700)]
diff-tree: don't print multiple headers for merges when silent.

Normally we show every facet of a merge, but when we're silent,
there's little point.

15 years ago[PATCH] Constness fix for pickaxe option.
Junio C Hamano [Sat, 21 May 2005 22:02:51 +0000 (15:02 -0700)]
[PATCH] Constness fix for pickaxe option.

Constness fix for pickaxe option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agodiff-tree: prettify output slightly
Linus Torvalds [Sat, 21 May 2005 18:04:19 +0000 (11:04 -0700)]
diff-tree: prettify output slightly

Make the commit explanation buffer larger, and make sure that if
we truncate it, we put a "..." marker there to visually tell people
about the truncation (tested with a much smaller buffer to make
sure it looks sane).

Also make sure that the explanation is properly line-terminated,
and add an extra newline iff we have a diff.

15 years agot/t4003-diff-rename-1: use modern options to "diff"
Linus Torvalds [Sat, 21 May 2005 17:11:37 +0000 (10:11 -0700)]
t/t4003-diff-rename-1: use modern options to "diff"

Don't do "-u0", use "--unified=0" which is accepted by modern GNU
diff versions.

15 years ago"make clean" should also clean up documentation
Linus Torvalds [Sat, 21 May 2005 16:59:37 +0000 (09:59 -0700)]
"make clean" should also clean up documentation

(Or, if somebody disagrees, we should have a "make distclean").

15 years ago[PATCH] Diff overhaul, adding the other half of copy detection.
Junio C Hamano [Sat, 21 May 2005 09:42:35 +0000 (02:42 -0700)]
[PATCH] Diff overhaul, adding the other half of copy detection.

This patch extends diff-cache and diff-files to report the
unmodified files to diff-core as well when -C (copy detection)
is in effect, so that the unmodified files can also be used as
the source candidates.  The existing test t4003 has been
extended to cover this case.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano [Sat, 21 May 2005 09:40:01 +0000 (02:40 -0700)]
[PATCH] Introducing software archaeologist's tool "pickaxe".

This steals the "pickaxe" feature from JIT and make it available
to the bare Plumbing layer.  From the command line, the user
gives a string he is intersted in.

Using the diff-core infrastructure previously introduced, it
filters the differences to limit the output only to the diffs
between <src> and <dst> where the string appears only in one but
not in the other.  For example:

 $ ./git-rev-list HEAD | ./git-diff-tree -Sdiff-tree-helper --stdin -M

would show the diffs that touch the string "diff-tree-helper".

In real software-archaeologist application, you would typically
look for a few to several lines of code and see where that code
came from.

The "pickaxe" module runs after "rename/copy detection" module,
so it even crosses the file rename boundary, as the above
example demonstrates.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano [Sat, 21 May 2005 09:39:09 +0000 (02:39 -0700)]
[PATCH] Diff overhaul, adding half of copy detection.

This introduces the diff-core, the layer between the diff-tree
family and the external diff interface engine.  The calls to the
interface diff-tree family uses (diff_change and diff_addremove)
have not changed and will not change.  The purpose of the
diff-core layer is to provide an infrastructure to transform the
set of differences sent from the applications, before sending
them to the external diff interface.

The recently introduced rename detection code has been rewritten
to use the diff-core facility.  When applications send in
separate creates and deletes, matching ones are transformed into
a single rename-and-edit diff, and sent out to the external diff
interface as such.

This patch also enhances the rename detection code further to be
able to detect copies.  Currently this happens only as long as
copy sources appear as part of the modified files, but there
already is enough provision for callers to report unmodified
files to diff-core, so that they can be also used as copy source
candidates.  Extending the callers this way will be done in a
separate patch.

Please see and marvel at how well this works by trying out the
newly added t/t4003-diff-rename-1.sh test script.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agogit-whatchanged: allow other pagers
Linus Torvalds [Sat, 21 May 2005 16:44:16 +0000 (09:44 -0700)]
git-whatchanged: allow other pagers

(but still try to use '-S' if using less)

15 years ago[PATCH] Fix use of wc in t0000-basic
Daniel Barkalow [Sat, 21 May 2005 00:49:13 +0000 (20:49 -0400)]
[PATCH] Fix use of wc in t0000-basic

The version of wc I have (GNU textutils-2.1) puts spaces at the beginning
of lines. This patch should work for any version of wc.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] delta creation
Nicolas Pitre [Fri, 20 May 2005 21:00:23 +0000 (17:00 -0400)]
[PATCH] delta creation

This adds the ability to actually create delta objects using a new tool:
git-mkdelta.  It uses an ordered list of potential objects to deltafy
against earlier objects in the list.  A cap on the depth of delta
references can be provided as well, otherwise the default is to not have
any limit.  A limit of 0 will also undeltafy any given object.

Also provided is the beginning of a script to deltafy an entire
repository.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] delta check
Nicolas Pitre [Fri, 20 May 2005 20:59:17 +0000 (16:59 -0400)]
[PATCH] delta check

This adds knowledge of delta objects to fsck-cache and various object
parsing code.  A new switch to git-fsck-cache is provided to display the
maximum delta depth found in a repository.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] delta read
Nicolas Pitre [Fri, 20 May 2005 20:57:28 +0000 (16:57 -0400)]
[PATCH] delta read

This makes the core code aware of delta objects and undeltafy them as
needed.  The convention is to use read_sha1_file() to have
undeltafication done automatically (most users do that already so this
is transparent).

If the delta object itself has to be accessed then it must be done
through map_sha1_file() and unpack_sha1_file().

In that context mktag.c has been switched to read_sha1_file() as there
is no reason to do the full map+unpack manually.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agosparse cleanup
Linus Torvalds [Fri, 20 May 2005 18:46:10 +0000 (11:46 -0700)]
sparse cleanup

Fix various things that sparse complains about:
 - use NULL instead of 0
 - make sure we declare everything properly, or mark it static
 - use proper function declarations ("fn(void)" instead of "fn()")

Sparse is always right.

15 years ago[PATCH] Simplify "reverse-diff" logic in the diff core.
Junio C Hamano [Fri, 20 May 2005 16:54:07 +0000 (09:54 -0700)]
[PATCH] Simplify "reverse-diff" logic in the diff core.

Instead of swapping the arguments just before output, this patch
makes the swapping happen on the input side of the diff core,
when "reverse-diff" is in effect.  This greatly simplifies the
logic, but more importantly it is necessary for upcoming "copy
detection" work.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Diff-files fix with more tests.
Junio C Hamano [Fri, 20 May 2005 16:48:38 +0000 (09:48 -0700)]
[PATCH] Diff-files fix with more tests.

The same check we added earlier to update-cache to catch ENOTDIR
turns out to be missing from diff-files.  This causes a
difference not being reported when you have DF/DF (a file in a
subdirectory) in the cache and DF is a file on the filesystem.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Add tests for diff-tree
Junio C Hamano [Fri, 20 May 2005 15:32:07 +0000 (08:32 -0700)]
[PATCH] Add tests for diff-tree

This adds and reorganizes some tests for diff-tree

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agodiff-tree: use new base_name_compare() helper function
Linus Torvalds [Fri, 20 May 2005 16:11:46 +0000 (09:11 -0700)]
diff-tree: use new base_name_compare() helper function

This fixes diff-tree sorting of directories vs files (we used to
use just the regular cache_name_compare() which only works on
full file pathnames).

15 years agoIntroduce "base_name_compare()" helper function
Linus Torvalds [Fri, 20 May 2005 16:09:18 +0000 (09:09 -0700)]
Introduce "base_name_compare()" helper function

This one compares two pathnames that may be partial basenames, not
full paths. We need to get the path sorting right, since a directory
name will sort as if it had the final '/' at the end.

15 years ago[PATCH] Document -R option for git-diff-tree.
Junio C Hamano [Fri, 20 May 2005 07:26:27 +0000 (00:26 -0700)]
[PATCH] Document -R option for git-diff-tree.

Obviously we would want to document this as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agofsck-cache: fix segfault on nonexistent referenced object
Linus Torvalds [Fri, 20 May 2005 14:49:17 +0000 (07:49 -0700)]
fsck-cache: fix segfault on nonexistent referenced object

Noted by Frank Sorenson and Petr Baudis, patch rewritten by me.

15 years agoFix up previous commit
Linus Torvalds [Fri, 20 May 2005 05:39:27 +0000 (22:39 -0700)]
Fix up previous commit

Add '-R' flag to diff-tree, and change the test subdirectory
shell files to be executable (something that Junio couldn't
get me to do through the pure patch with my current patch
handling infrastructure).

15 years ago[PATCH] diff overhaul
Junio C Hamano [Fri, 20 May 2005 02:00:36 +0000 (19:00 -0700)]
[PATCH] diff overhaul

This cleans up the way calls are made into the diff core from diff-tree
family and diff-helper.  Earlier, these programs had "if
(generating_patch)" sprinkled all over the place, but those ugliness are
gone and handled uniformly from the diff core, even when not generating
patch format.

This also allowed diff-cache and diff-files to acquire -R
(reverse) option to generate diff in reverse.  Users of
diff-tree can swap two trees easily so I did not add -R there.

[ Linus' note: I'll add -R to "diff-tree" too, since a "commit
  diff" doesn't have another tree to switch around: the other
  tree is always the parent(s) of the commit ]

Also -M<digits-as-mantissa> suggestion made by Linus has been
implemented.

Documentation updates are also included.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years agodiff-tree: add "--root" flag to show a root commit as a big creation event.
Linus Torvalds [Thu, 19 May 2005 20:44:29 +0000 (13:44 -0700)]
diff-tree: add "--root" flag to show a root commit as a big creation event.

"Let there be light"

15 years ago[PATCH] cleanup of in-code names
Alexey Nezhdanov [Thu, 19 May 2005 11:17:16 +0000 (15:17 +0400)]
[PATCH] cleanup of in-code names

Fixes all in-code names that leaved during "big name change".

Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Declare stacked variables before the first statement.
Thomas Glanzmann [Thu, 19 May 2005 13:23:18 +0000 (15:23 +0200)]
[PATCH] Declare stacked variables before the first statement.

Signed-off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] Detect renames in diff family.
Junio C Hamano [Thu, 19 May 2005 17:13:01 +0000 (10:13 -0700)]
[PATCH] Detect renames in diff family.

A bit of clean-up of diff.c which fixes up some comments and removes a
memory leak.

This also re-introduces the rename score debugging fprintf(), but leaves
it #idef'ed it out for normal use.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 years ago[PATCH] manpage name conflict
Sebastian Kuzminsky [Thu, 19 May 2005 16:24:54 +0000 (10:24 -0600)]
[PATCH] manpage name conflict

This moves the git manpage to man7, since "git" isn't a direct command
per se.  It also does two other things:

    * Sort of works around the asciidoc 6.0.3 bug where the manpages all
      get called "git.1".  It just renames them to what they should have
      been called.

    * Fixes a cut-n-paste bug in git-diff-helper.txt that was making
      asciidoc choke.

15 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>
15 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 ;)

15 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

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

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

15 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>
15 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".

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

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

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

15 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).

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

15 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)

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

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

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

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

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

15 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>
15 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>
15 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>
15 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>
15 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>
15 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>
15 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>
15 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>
15 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

15 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>
15 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

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

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

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

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

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

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

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

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

15 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>
15 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().

15 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>
15 years agoDocument git-merge-cache -o
Petr Baudis [Wed, 11 May 2005 02:49:36 +0000 (04:49 +0200)]
Document git-merge-cache -o

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

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

15 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>
15 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>
15 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