Code

git.git
19 years agogit-fsck-cache: complain if no default references found
Linus Torvalds [Sun, 5 Jun 2005 16:55:27 +0000 (09:55 -0700)]
git-fsck-cache: complain if no default references found

19 years agopretty_print_commit: add different formats
Linus Torvalds [Sun, 5 Jun 2005 16:02:03 +0000 (09:02 -0700)]
pretty_print_commit: add different formats

You can ask to print out "raw" format (full headers, full body),
"medium" format (author and date, full body) or "short" format
(author only, condensed body).

Use "git-rev-list --pretty=short HEAD | less -S" for an example.

19 years agogit-shortlog: add name translations for 'sparse' repo
Linus Torvalds [Sun, 5 Jun 2005 03:33:01 +0000 (20:33 -0700)]
git-shortlog: add name translations for 'sparse' repo

19 years agoAdd git-shortlog perl script
Linus Torvalds [Sun, 5 Jun 2005 03:21:35 +0000 (20:21 -0700)]
Add git-shortlog perl script

Somebody finally came through - Jeff Garzik gets a gold
star for writing a shortlog script for git, so that I
can do nice release announcments again.

I added name translations from the current kernel history
(and git, for that matter). Hopefully it won't grow at
nearly the same rate the BK equivalent did, since 99% of
the time git records the full name already.

Usage: just do

        git-rev-list --pretty HEAD ^LAST_HEAD | git-shortlog

or, in fact, use any of the other tools (git-diff-tree,
git-whatchanged etc) that use the default "pretty" commit format.

19 years agogit-rev-list: allow arbitrary head selections, use git-rev-tree syntax
Linus Torvalds [Sat, 4 Jun 2005 21:38:28 +0000 (14:38 -0700)]
git-rev-list: allow arbitrary head selections, use git-rev-tree syntax

This makes git-rev-list use the same command line syntax to mark the
commits as git-rev-tree does, and instead of just allowing a start and
end commit, it allows an arbitrary list of "interesting" and "uninteresting"
commits.

For example, imagine that you had three branches (a, b and c) that you
are interested in, but you don't want to see stuff that already exists
in another persons three releases (x, y and z). You can do

git-rev-list a b c ^x ^y ^z

(order doesn't matter, btw - feel free to put the uninteresting ones
first or otherwise swithc them around), and it will show all the
commits that are reachable from a/b/c but not reachable from x/y/z.

The old syntax "git-rev-list start end" would not be written as
"git-rev-list start ^end", or "git-rev-list ^end start".

There's no limit to the number of heads you can specify (unlike
git-rev-tree, which can handle a maximum of 16 heads).

19 years ago[PATCH] ssh-protocol version, command types, response code
Daniel Barkalow [Fri, 3 Jun 2005 21:43:52 +0000 (17:43 -0400)]
[PATCH] ssh-protocol version, command types, response code

This patch makes an incompatible change to the protocol used by
rpull/rpush which will let it be extended in the future without
incompatible changes.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: Update -B heuristics.
Junio C Hamano [Fri, 3 Jun 2005 08:40:28 +0000 (01:40 -0700)]
[PATCH] diff: Update -B heuristics.

As Linus pointed out on the mailing list discussion, -B should
break a files that has many inserts even if it still keeps
enough of the original contents, so that the broken pieces can
later be matched with other files by -M or -C.  However, if such
a broken pair does not get picked up by -M or -C, we would want
to apply different criteria; namely, regardless of the amount of
new material in the result, the determination of "rewrite"
should be done by looking at the amount of original material
still left in the result.  If you still have the original 97
lines from a 100-line document, it does not matter if you add
your own 13 lines to make a 110-line document, or if you add 903
lines to make a 1000-line document.  It is not a rewrite but an
in-place edit.  On the other hand, if you did lose 97 lines from
the original, it does not matter if you added 27 lines to make a
30-line document or if you added 997 lines to make a 1000-line
document.  You did a complete rewrite in either case.

This patch introduces a post-processing phase that runs after
diffcore-rename matches up broken pairs diffcore-break creates.
The purpose of this post-processing is to pick up these broken
pieces and merge them back into in-place modifications.  For
this, the score parameter -B option takes is changed into a pair
of numbers, and it takes "-B99/80" format when fully spelled
out.  The first number is the minimum amount of "edit" (same
definition as what diffcore-rename uses, which is "sum of
deletion and insertion") that a modification needs to have to be
broken, and the second number is the minimum amount of "delete"
a surviving broken pair must have to avoid being merged back
together.  It can be abbreviated to "-B" to use default for
both, "-B9" or "-B9/" to use 90% for "edit" but default (80%)
for merge avoidance, or "-B/75" to use default (99%) "edit" and
75% for merge avoidance.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: Clean up diff_scoreopt_parse().
Junio C Hamano [Fri, 3 Jun 2005 08:37:54 +0000 (01:37 -0700)]
[PATCH] diff: Clean up diff_scoreopt_parse().

This cleans up diff_scoreopt_parse() function that is used to
parse the fractional notation -B, -C and -M option takes.  The
callers are modified to check for errors and complain.  Earlier
they silently ignored malformed input and falled back on the
default.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: Fix docs and add -O to diff-helper.
Junio C Hamano [Fri, 3 Jun 2005 08:36:43 +0000 (01:36 -0700)]
[PATCH] diff: Fix docs and add -O to diff-helper.

This patch updates diff documentation and usage strings:

 - clarify the semantics of -R.  It is not "output in reverse";
   rather, it is "I will feed diff backwards".  Semantically
   they are different when -C is involved.

 - describe -O in usage strings of diff-* brothers.  It was
   implemented, documented but not described in usage text.

Also it adds -O to diff-helper.  Like -S (and unlike -M/-C/-B),
this option can work on sanitized diff-raw output produced by
the diff-* brothers.  While we are at it, the call it makes to
diffcore is cleaned up to use the diffcore_std() like everybody
else, and the declaration for the low level diffcore routines
are moved from diff.h (public) to diffcore.h (private between
diff.c and diffcore backends).

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Tweak count-delta interface
Junio C Hamano [Fri, 3 Jun 2005 08:36:03 +0000 (01:36 -0700)]
[PATCH] Tweak count-delta interface

Make it return copied source and insertion separately, so that
later implementation of heuristics can use them more flexibly.

This does not change the heuristics implemented in
diffcore-rename nor diffcore-break in any way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-tar-tree: do only basic tests in t/t5000-git-tar-tree.sh
Rene Scharfe [Fri, 3 Jun 2005 16:21:23 +0000 (18:21 +0200)]
[PATCH] git-tar-tree: do only basic tests in t/t5000-git-tar-tree.sh

git-tar-tree: remove tests of long path handling out of t5000-tar-tree.sh
and make test script cope with tar programs displaying file modification
date as hh:mm (newer variants show it as hh:mm:ss).

This makes the test cover only basic functionality that is expected to
be handled even by older tar programs.  Tests for long filenames (which
require pax extended headers) can be added separately.

I ran this test successfully with GNU tar 1.13, 1.14 and 1.15.1.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-tar-tree: fix write_trailer
Rene Scharfe [Fri, 3 Jun 2005 11:25:18 +0000 (13:25 +0200)]
[PATCH] git-tar-tree: fix write_trailer

write_trailer() writes the last 10k (a full block) of the tar archive.
write_if_needed() writes out a block *if* it is full and then sets
the offset to 0.  In nine out of ten cases the messed up write_trailer()
function didn't manage to fill the block thus not writing anything at
all, truncating the archive.  I was "lucky" to hit the other case and so
my testing ran OK.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-tar-tree: add a test case
Rene Scharfe [Thu, 2 Jun 2005 20:50:17 +0000 (22:50 +0200)]
[PATCH] git-tar-tree: add a test case

add a simple test case.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-tar-tree: small doc update
Rene Scharfe [Thu, 2 Jun 2005 18:50:42 +0000 (20:50 +0200)]
[PATCH] git-tar-tree: small doc update

document difference in behaviour w/ regard to tree vs.  commit and
correct author information.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-tar-tree: cleanup write_trailer()
Rene Scharfe [Thu, 2 Jun 2005 18:50:48 +0000 (20:50 +0200)]
[PATCH] git-tar-tree: cleanup write_trailer()

replace open-coded variants of get_record().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoClarify git-diff-cache semantics in the tutorial.
Linus Torvalds [Fri, 3 Jun 2005 00:15:32 +0000 (17:15 -0700)]
Clarify git-diff-cache semantics in the tutorial.

Adam Kropelin points out that it wasn't all that clear
at all what the thing does. This hopefully helps a bit.

19 years ago[PATCH] Find size of SHA1 object without inflating everything.
Junio C Hamano [Thu, 2 Jun 2005 22:20:54 +0000 (15:20 -0700)]
[PATCH] Find size of SHA1 object without inflating everything.

This adds sha1_file_size() helper function and uses it in the
rename/copy similarity estimator.  The helper function handles
deltified object as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Handle deltified object correctly in git-*-pull family.
Junio C Hamano [Thu, 2 Jun 2005 22:19:00 +0000 (15:19 -0700)]
[PATCH] Handle deltified object correctly in git-*-pull family.

When a remote repository is deltified, we need to get the
objects that a deltified object we want to obtain is based upon.
The initial parts of each retrieved SHA1 file is inflated and
inspected to see if it is deltified, and its base object is
asked from the remote side when it is.  Since this partial
inflation and inspection has a small performance hit, it can
optionally be skipped by giving -d flag to git-*-pull commands.
This flag should be used only when the remote repository is
known to have no deltified objects.

Rsync transport does not have this problem since it fetches
everything the remote side has.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-rev-list: split out commit limiting from main() too.
Linus Torvalds [Thu, 2 Jun 2005 16:25:44 +0000 (09:25 -0700)]
git-rev-list: split out commit limiting from main() too.

Ok, now I'm happier.

19 years agogit-rev-list: factor out the commit printing from "main()"
Linus Torvalds [Thu, 2 Jun 2005 16:19:53 +0000 (09:19 -0700)]
git-rev-list: factor out the commit printing from "main()"

Functions that do many things are bad. We should basically
just parse the arguments in main(). We're not quite there
yet, but it's a step in the right direction.

19 years agoRun the tutorial through ispell once more
Linus Torvalds [Thu, 2 Jun 2005 14:58:41 +0000 (07:58 -0700)]
Run the tutorial through ispell once more

People are making fun of me for being a bad speeler.

19 years agoSplit up unpack_sha1_file() some more
Linus Torvalds [Thu, 2 Jun 2005 14:57:25 +0000 (07:57 -0700)]
Split up unpack_sha1_file() some more

Make a separate helper for parsing the header of an object file
(really carefully) and for unpacking the rest. This means that
anybody who uses the "unpack_sha1_header()" interface can easily
look at the header and decide to unpack the rest too, without
doing any extra work.

19 years agoAdd "unpack_sha1_header()" helper function
Linus Torvalds [Thu, 2 Jun 2005 00:54:59 +0000 (17:54 -0700)]
Add "unpack_sha1_header()" helper function

It's for people who aren't necessarily interested in the whole
unpacked file, but do want to know the header information (size,
type, etc..)

For example, the delta code can use this to figure out whether
an object is already a delta object, and what it is a delta
against, without actually bothering to unpack all of the actual
data in the delta.

19 years agotutorial.txt: start describing how to copy repositories
Linus Torvalds [Thu, 2 Jun 2005 00:48:33 +0000 (17:48 -0700)]
tutorial.txt: start describing how to copy repositories

Both locally and remotely.

19 years ago[PATCH] diff: mode bits fixes
Junio C Hamano [Wed, 1 Jun 2005 18:38:07 +0000 (11:38 -0700)]
[PATCH] diff: mode bits fixes

The core GIT repository has trees that record regular file mode
in 0664 instead of normalized 0644 pattern.  Comparing such a
tree with another tree that records the same file in 0644
pattern without content changes with git-diff-tree causes it to
feed otherwise unmodified pairs to the diff_change() routine,
which triggers a sanity check routine and barfs.  This patch
fixes the problem, along with the fix to another caller that
uses unnormalized mode bits to call diff_change() routine in a
similar way.

Without this patch, you will see "fatal error" from diff-tree
when you run git-deltafy-script on the core GIT repository
itself.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoUpdate tutorial for simplified "git" script.
Linus Torvalds [Wed, 1 Jun 2005 16:27:22 +0000 (09:27 -0700)]
Update tutorial for simplified "git" script.

Use "git commit" instead of "git-commit-script", and talk about using
"git log" before introducing the more complex "git-whatchanged".

In short, try to make it feel a bit more normal to those poor souls
using CVS.

Do some whitspace edits too, to make the side notes stand out a bit
more.

19 years agoAdd "git" and "git-log-script" helper scripts.
Linus Torvalds [Wed, 1 Jun 2005 16:13:26 +0000 (09:13 -0700)]
Add "git" and "git-log-script" helper scripts.

The "git" script is just shorthand: "git xyz <args>" will just execute
"git-xyz-script <args>", which is useful for people used to the CVS
naming convention. So "git log" will run the new git-log-script, which
is just a wrapper around the new pretty-printing git-rev-list.

Cheesy.

19 years agogit-rev-list: add "--pretty" command line option
Linus Torvalds [Wed, 1 Jun 2005 15:42:22 +0000 (08:42 -0700)]
git-rev-list: add "--pretty" command line option

That pretty-prints the resulting commit messages, so

git-rev-list --pretty HEAD v2.6.12-rc5 | less -S

basically ends up being a log of the changes between -rc5
and current head.

It uses the pretty-printing helper function I just extracted
from diff-tree.c.

19 years agoAdd generic commit "pretty print" function.
Linus Torvalds [Wed, 1 Jun 2005 15:34:23 +0000 (08:34 -0700)]
Add generic commit "pretty print" function.

It's really just the header printign function from diff-tree.c,
and it's usable for other things too.

19 years ago[PATCH] git: git-commit-script ignores $GIT_DIR
Alexey Guzeev [Wed, 1 Jun 2005 04:31:02 +0000 (00:31 -0400)]
[PATCH] git: git-commit-script ignores $GIT_DIR

19 years agotutorial.txt: fix typos and a'git-whatchanged' example
Linus Torvalds [Wed, 1 Jun 2005 14:39:36 +0000 (07:39 -0700)]
tutorial.txt: fix typos and a'git-whatchanged' example

Pointed out by Junio. I kant't speel.

19 years agogit-apply --stat: limit lines to 79 characters
Linus Torvalds [Wed, 1 Jun 2005 03:50:49 +0000 (20:50 -0700)]
git-apply --stat: limit lines to 79 characters

It had already tried to do that, but with the independent
rounding of the number of '+' and '-' characters, it would
sometimes do 80-char lines after all.

19 years ago[PATCH] ls-tree: handle trailing slashes in the pathspec properly.
Junio C Hamano [Wed, 1 Jun 2005 01:46:47 +0000 (18:46 -0700)]
[PATCH] ls-tree: handle trailing slashes in the pathspec properly.

This fixes the problem with ls-tree which failed to show
"drivers/char" directory when the user asked for "drivers/char/"
from the command line.  At the same time, if "drivers/char" were
a non directory, "drivers/char/" would not show it.  This is
consistent with the way diffcore-pathspec has been recently
fixed.

This adds back the diffcore-pathspec test,dropped when my
earlier diffcore-pathspec fix was rejected.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd first cut at a simple git tutorial.
Linus Torvalds [Wed, 1 Jun 2005 02:50:34 +0000 (19:50 -0700)]
Add first cut at a simple git tutorial.

This really is very basic stuff, no branches, no merging, no CVS
imports. Let's start small.

19 years ago[PATCH] diff: consolidate test helper script pieces.
Junio C Hamano [Tue, 31 May 2005 21:47:25 +0000 (14:47 -0700)]
[PATCH] diff: consolidate test helper script pieces.

There were duplicate script pieces to help comparing diff
output, which this patch consolidates into the t/diff-lib.sh
library.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agopathspec: fix pathspecs with '/' at the end
Linus Torvalds [Tue, 31 May 2005 22:17:58 +0000 (15:17 -0700)]
pathspec: fix pathspecs with '/' at the end

Removing (and ignoring) them is wrong, since that means
that a pathspec of "xxxx/" would match a regular filename
of "xxxx", which is obviously incorrect.

19 years agogit-apply: don't try to be clever about filenames and the index
Linus Torvalds [Tue, 31 May 2005 22:05:59 +0000 (15:05 -0700)]
git-apply: don't try to be clever about filenames and the index

It just causes things like "git-apply --stat" to parse traditional
patch headers differently depending on what your index is, which
is nasty.

19 years agogit-rev-list: add "--parents" command line flag
Linus Torvalds [Tue, 31 May 2005 02:30:07 +0000 (19:30 -0700)]
git-rev-list: add "--parents" command line flag

It makes rev-list show the list of parents, the same
way git-rev-tree does (but without the expense).

19 years agogit-rev-list: use proper lazy reachability analysis
Linus Torvalds [Tue, 31 May 2005 01:46:32 +0000 (18:46 -0700)]
git-rev-list: use proper lazy reachability analysis

This mean sthat you can give a beginning/end pair to git-rev-list,
and it will show all entries that are reachable from the beginning
but not the end.

For example

git-rev-list v2.6.12-rc5 v2.6.12-rc4

shows all commits that are in -rc5 but are not in -rc4.

19 years agocommit_list_insert: return the new commit list entry
Linus Torvalds [Tue, 31 May 2005 01:44:02 +0000 (18:44 -0700)]
commit_list_insert: return the new commit list entry

This is useful for when we want to insert the next one after
this new one, for example.

19 years ago[PATCH] Show dissimilarity index for D and N case.
Junio C Hamano [Mon, 30 May 2005 23:40:16 +0000 (16:40 -0700)]
[PATCH] Show dissimilarity index for D and N case.

The way broken deletes and creates are shown in the -p
(diff-patch) output format has become consistent with how
rename/copy edits are shown.  They will show "dissimilarity
index" value, immediately following the "deleted file mode" and
"new file mode" lines.

The git-apply is taught to grok such an extended header.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add -O<orderfile> option to diff-* brothers.
Junio C Hamano [Mon, 30 May 2005 07:09:07 +0000 (00:09 -0700)]
[PATCH] Add -O<orderfile> option to diff-* brothers.

A new diffcore filter diffcore-order is introduced.  This takes
a text file each of whose line is a shell glob pattern.  Patches
that match a glob pattern on an earlier line in the file are
output before patches that match a later line, and patches that
do not match any glob pattern are output last.

A typical orderfile for git project probably should look like
this:

    README
    Makefile
    Documentation
    *.h
    *.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Buglets fix in the new two scripts
Junio C Hamano [Mon, 30 May 2005 20:53:45 +0000 (13:53 -0700)]
[PATCH] Buglets fix in the new two scripts

Should be obvious...

 - Use $VISUAL, $EDITOR, in this order if set, and fall back on
   vi.

 - Status R, C, D, N usually are followed by number, so adjust
   case arms to that pattern.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-resolve-script: use "git-apply --stat" instead of diffstat
Linus Torvalds [Tue, 31 May 2005 00:45:41 +0000 (17:45 -0700)]
git-resolve-script: use "git-apply --stat" instead of diffstat

Not everybody necessarily even has diffstat installed.

19 years ago[PATCH] mkdelta enhancements (take 2)
Nicolas Pitre [Mon, 30 May 2005 01:52:19 +0000 (21:52 -0400)]
[PATCH] mkdelta enhancements (take 2)

Although it was described as such, git-mkdelta didn't really attempt to
find the best delta against any previous object in the list, but was
only able to create a delta against the preceeding object.  This patch
reworks the code to fix that limitation and hopefully makes it a bit
clearer than before, including fixing the delta loop detection which was
broken.

This means that

git-mkdelta sha1 sha2 sha3 sha4 sha5 sha6

will now create a sha2 delta against sha1, a sha3 delta against either
sha2 or sha1 and keep the best one, a sha4 delta against either sha3,
sha2 or sha1, etc.  The --max-behind argument limits that search for the
best delta to the specified number of previous objects in the list.  If
no limit is specified it is unlimited (note: it might run out of
memory with long object lists).

Also added a -q (quiet) switch so it is possible to have 3 levels of
output: -q for nothing, -v for verbose, and if none of -q nor -v is
specified then only actual changes on the object database are shown.

Finally the git-deltafy-script has been updated accordingly, and some
bugs fixed (thanks to Stephen C. Tweedie for spotting them).

This version has been toroughly tested and I think it is ready
for public consumption.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd "commit" helper script
Linus Torvalds [Mon, 30 May 2005 19:51:00 +0000 (12:51 -0700)]
Add "commit" helper script

This is meant to make raw git not hugely less usable than something
like raw CVS. I want to make a 1.0 release of the plumbing, and the
actual commit part was just too intimidating.

19 years ago[PATCH] Add -B flag to diff-* brothers.
Junio C Hamano [Mon, 30 May 2005 07:08:37 +0000 (00:08 -0700)]
[PATCH] Add -B flag to diff-* brothers.

A new diffcore transformation, diffcore-break.c, is introduced.

When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation.  This
makes it easier to review such a complete rewrite patch.

The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.

As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used.  For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:

    The original change looks like this:

file0     --> file0' (quite different from file0)
file1     --> /dev/null

    After diffcore-break runs, it would become this:

file0     --> /dev/null
/dev/null --> file0'
file1     --> /dev/null

    Then diffcore-rename matches them up:

file1     --> file0'

The internal score values are finer grained now.  Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: fix the culling of unneeded delete record.
Junio C Hamano [Mon, 30 May 2005 07:08:07 +0000 (00:08 -0700)]
[PATCH] diff: fix the culling of unneeded delete record.

The commit 15d061b435a7e3b6bead39df3889f4af78c4b00a

    [PATCH] Fix the way diffcore-rename records unremoved source.

still leaves unneeded delete records in its output stream by
mistake, which was covered up by having an extra check to turn
such a delete into a no-op downstream.  Fix the check in the
diffcore-rename to simplify the output routine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: further cleanup.
Junio C Hamano [Mon, 30 May 2005 07:07:39 +0000 (00:07 -0700)]
[PATCH] diff: further cleanup.

When preparing data to feed the external diff, we should give
the mode we obtained from the caller, even when we are dealing
with a file with 0{40} SHA1 (i.e. the caller said "look at the
filesystem"), since the mode passed by the caller via
diff_addremove() or diff_change() is always trustworthy.

This is _not_ a bugfix --- the existing code stat() on the file
ifself and does the same computation on st.st_mode to compute
the mode the same way the caller did to give the original mode.
We cannot remove the stat() call from here, but the extra
computation to create the mode value is unnecessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: code clean-up and removal of rename hack.
Junio C Hamano [Sun, 29 May 2005 23:56:48 +0000 (16:56 -0700)]
[PATCH] diff: code clean-up and removal of rename hack.

A new macro, DIFF_PAIR_RENAME(), is introduced to distinguish a
filepair that is a rename/copy (the definition of which is src
and dst are different paths, of course).  This removes the hack
used in the record_rename_pair() to always put a non-zero value
in the score field.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff: consolidate various calls into diffcore.
Junio C Hamano [Sun, 29 May 2005 23:56:13 +0000 (16:56 -0700)]
[PATCH] diff: consolidate various calls into diffcore.

The three diff-* brothers had a sequence of calls into diffcore
that were almost identical.  Introduce a new diffcore_std()
function that takes all the necessary arguments to consolidate
it.  This will make later enhancements and changing the order of
diffcore application simpler.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff-helper: Fix R/C score parsing under -z flag.
Junio C Hamano [Sun, 29 May 2005 23:54:59 +0000 (16:54 -0700)]
[PATCH] diff-helper: Fix R/C score parsing under -z flag.

The score number that follow R/C status were parsed but the
parse pointer was not updated, causing the entire line to become
unrecognized.  This patch fixes this problem.

There was a test missing to catch this breakage, which this
commit adds as t4009-diff-rename-4.sh.  The diff-raw tests used
in related t4005-diff-rename-2.sh (the same test without -z) and
t4007-rename-3.sh were stricter than necessarily, despite that
the comment for the tests said otherwise.  This patch also
corrects them.

The documentation is updated to say that the status can
optionally be followed by a number called "score"; it does not
have to stay similarity index forever and there is no reason to
limit it only to C and R.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-init-db: set up the full default environment
Linus Torvalds [Mon, 30 May 2005 17:20:44 +0000 (10:20 -0700)]
git-init-db: set up the full default environment

Create .git/refs/{heads,tags} and make .git/HEAD be a symlink to
(the as yet non-existent) .git/refs/heads/master.

19 years agogit-mktag: be more careful in reading the input.
Linus Torvalds [Sun, 29 May 2005 19:06:32 +0000 (12:06 -0700)]
git-mktag: be more careful in reading the input.

Instead of always assuming it can be read with a single
read() system call, loop around properly.

Pointed out by Pasky, but I ended up implementing it differently
from his suggested patch.

19 years ago[PATCH] Fix count-delta overcounting
Junio C Hamano [Sat, 28 May 2005 19:22:38 +0000 (12:22 -0700)]
[PATCH] Fix count-delta overcounting

The count-delta routine sometimes overcounted the copied source
material which resulted in unsigned int wraparound.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Do not include unused header files.
Junio C Hamano [Sat, 28 May 2005 09:55:16 +0000 (02:55 -0700)]
[PATCH] Do not include unused header files.

Some source files were including "delta.h" without actually
needing it.  Remove them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Pickaxe fixes.
Junio C Hamano [Sat, 28 May 2005 09:53:43 +0000 (02:53 -0700)]
[PATCH] Pickaxe fixes.

A bug in the command line argument parsing code was making
pickaxe not to work at all in diff-cache and diff-files commands.
Embarrassingly enough, the working pickaxe in diff-tree tells me
that it was not working in these two commands from day one.
This patch fixes it.

Also updates the documentation to describe the --pickaxe-all option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
Junio C Hamano [Sat, 28 May 2005 07:05:38 +0000 (00:05 -0700)]
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"

This is a complete rewrite of ls-tree to make it behave more
like what "/bin/ls -a" does in the current working directory.

Namely, the changes are:

 - Unlike the old ls-tree behaviour that used paths arguments to
   restrict output (not that it worked as intended---as pointed
   out in the mailing list discussion, it was quite incoherent),
   this rewrite uses paths arguments to specify what to show.

 - Without arguments, it implicitly uses the root level as its
   sole argument ("/bin/ls -a" behaves as if "." is given
   without argument).

 - Without -r (recursive) flag, it shows the named blob (either
   file or symlink), or the named tree and its immediate
   children.

 - With -r flag, it shows the named path, and recursively
   descends into it if it is a tree.

 - With -d flag, it shows the named path and does not show its
   children even if the path is a tree, nor descends into it
   recursively.

This is still request-for-comments patch.  There is no mailing
list consensus that this proposed new behaviour is a good one.

The patch to t/t3100-ls-tree-restrict.sh illustrates
user-visible behaviour changes.  Namely:

 * "git-ls-tree $tree path1 path0" lists path1 first and then
   path0.  It used to use paths as an output restrictor and
   showed output in cache entry order (i.e. path0 first and then
   path1) regardless of the order of paths arguments.

 * "git-ls-tree $tree path2" lists path2 and its immediate
   children but having explicit paths argument does not imply
   recursive behaviour anymore, hence paths/baz is shown but not
   paths/baz/b.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Adjust diff-helper to diff-tree -v -z changes.
Junio C Hamano [Sat, 28 May 2005 04:05:38 +0000 (21:05 -0700)]
[PATCH] Adjust diff-helper to diff-tree -v -z changes.

The latest change to diff-tree -z output adds an extra line
termination after non diff-raw material (the header and the
commit message).  To compensate for this change, stop adding the
output termination of our own.  "diff-tree -v -z" piped to
"diff-helper -z" would give different result from "diff-tree -v"
piped to "diff-helper" without this change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano [Fri, 27 May 2005 22:56:38 +0000 (15:56 -0700)]
[PATCH] Optimize diff-tree -[CM] --stdin

This attempts to optimize "diff-tree -[CM] --stdin", which
compares successible tree pairs.  This optimization does not
make much sense for other commands in the diff-* brothers.

When reading from --stdin and using rename/copy detection, the
patch makes diff-tree to read the current index file first.
This is done to reuse the optimization used by diff-cache in the
non-cached case.  Similarity estimator can avoid expanding a
blob if the index says what is in the work tree has an exact
copy of that blob already expanded.

Another optimization the patch makes is to check only file sizes
first to terminate similarity estimation early.  In order for
this to work, it needs a way to tell the size of the blob
without expanding it.  Since an obvious way of doing it, which
is to keep all the blobs previously used in the memory, is too
costly, it does so by keeping the filesize for each object it
has already seen in memory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Move pathspec to the beginning of the diffcore chain.
Junio C Hamano [Fri, 27 May 2005 22:56:17 +0000 (15:56 -0700)]
[PATCH] Move pathspec to the beginning of the diffcore chain.

This changes the way how pathspec is used in the three diff-*
brothers.  Earlier, they tried to grab as much information from
the original input and used pathspec to limit the output.  This
version uses pathspec upfront to narrow the world diffcore
operates in, so "git-diff-* <arguments> some-directory" does not
look at things outside the specified subtree when finding
rename/copy or running pickaxe.

Since diff-tree already takes this view and does not feed
anything outside the specified directotires to begin with, this
patch does not have to touch that command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix the way diffcore-rename records unremoved source.
Junio C Hamano [Fri, 27 May 2005 22:55:55 +0000 (15:55 -0700)]
[PATCH] Fix the way diffcore-rename records unremoved source.

Earier version of diffcore-rename used to keep unmodified
filepair in its output so that the last stage of the processing
that tells renames from copies can make all of rename/copy to
copies.  However this had a bad interaction with other diffcore
filters that wanted to run after diffcore-rename, in that such
unmodified filepair must be retained for proper distinction
between renames and copies to happen.

This patch fixes the problem by changing the way diffcore-rename
records the information needed to distinguish "all are copies"
case and "the last one is a rename" case.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add --pickaxe-all to diff-* brothers.
Junio C Hamano [Fri, 27 May 2005 22:55:28 +0000 (15:55 -0700)]
[PATCH] Add --pickaxe-all to diff-* brothers.

When --pickaxe-all is given in addition to -S, pickaxe shows the
entire diffs contained in the changeset, not just the diffs for
the filepair that touched the sought-after string.  This is
useful to see the changes in context.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Remove a function not used anymore.
Junio C Hamano [Fri, 27 May 2005 22:55:01 +0000 (15:55 -0700)]
[PATCH] Remove a function not used anymore.

Earlier rename/copy detection left unmodified filepair in the
output and forced downstream to keep them even when they are
filtering, and the diff_needs_to_stay() function was used for
the logic.  It is not used anymore, so remove it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Clean up diff_setup() to make it more extensible.
Junio C Hamano [Fri, 27 May 2005 22:54:37 +0000 (15:54 -0700)]
[PATCH] Clean up diff_setup() to make it more extensible.

This changes the argument of diff_setup() from an integer that
says if we are feeding reversed diff to a bitmask, so that later
global options can be added more easily.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Remove final newline from the value of xfrm_msg variable.
Junio C Hamano [Fri, 27 May 2005 22:54:06 +0000 (15:54 -0700)]
[PATCH] Remove final newline from the value of xfrm_msg variable.

This change makes the implementation of git-external-diff-script
cleaner.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Do not expose internal scaling to diff-helper.
Junio C Hamano [Fri, 27 May 2005 22:53:31 +0000 (15:53 -0700)]
[PATCH] Do not expose internal scaling to diff-helper.

Instead we can normalize what diff-raw records at the diffcore
side.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Remove unused rank field from diff_core structure.
Junio C Hamano [Fri, 27 May 2005 22:52:55 +0000 (15:52 -0700)]
[PATCH] Remove unused rank field from diff_core structure.

This removes a field that is no longer used from diff_score
structure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Make pathspec only care about the detination tree.
Junio C Hamano [Fri, 27 May 2005 22:51:52 +0000 (15:51 -0700)]
[PATCH] Make pathspec only care about the detination tree.

Earlier it had a misguided attempt to include paths that matches
either source tree or destination tree after the rename/copy
detection.  The new semantics will be that pathspec defines a
narrowed down world the diffcore operates in, so it should not
even look at where in the source tree the path came from.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Introduce diff_free_filepair() funcion.
Junio C Hamano [Fri, 27 May 2005 22:50:30 +0000 (15:50 -0700)]
[PATCH] Introduce diff_free_filepair() funcion.

This introduces a new function to free a common data structure,
and plugs some leaks.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix math thinko in similarity estimator.
Junio C Hamano [Fri, 27 May 2005 22:49:54 +0000 (15:49 -0700)]
[PATCH] Fix math thinko in similarity estimator.

The math to reject delta that is too big was confused.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Document the --root switch of git-diff-tree
Thomas Glanzmann [Sat, 28 May 2005 14:42:17 +0000 (16:42 +0200)]
[PATCH] Document the --root switch of git-diff-tree

Signed-off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] check_file_directory_conflict path fix
David Meybohm [Fri, 27 May 2005 02:59:10 +0000 (22:59 -0400)]
[PATCH] check_file_directory_conflict path fix

check_file_directory_conflict can give the wrong answers. This is
because the wrong length is passed to cache_name_pos. The length
passed should be the length of the whole path from the root, not
the length of each path subcomponent.

$ git-init-db
defaulting to local storage area
$ mkdir path && touch path/file
$ git-update-cache --add path/file
$ rm path/file
$ mkdir path/file && touch path/file/f
$ git-update-cache --add path/file/f  <-- Conflict ignored
$

Signed-off-by: David Meybohm <dmeybohmlkml@bellsouth.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-diff-tree: simplify header output with '-z'
Linus Torvalds [Fri, 27 May 2005 17:22:09 +0000 (10:22 -0700)]
git-diff-tree: simplify header output with '-z'

No need to make them multiple lines, in fact we explicitly don't want that.

This also fixes a 64-bit problem pointed out by Markus F.X.J. Oberhumer,
where we gave "%.*s" a "ptrdiff_t" length argument instead of an "int".

19 years ago[PATCH] allow pathspec to end with a slash
Junio C Hamano [Fri, 27 May 2005 00:52:43 +0000 (17:52 -0700)]
[PATCH] allow pathspec to end with a slash

The recent rewrite broke "git-whatchanged -v -p drivers/usb/" but
"git-whatchanged -v -p drivers/usb" still works.  Just strip out the
trailing slashes internally to make it work again.

It uses compare-thing-with-number comparison order instead of visual
comparison order ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-diff-tree: don't use diffcore_pathspec()
Linus Torvalds [Fri, 27 May 2005 00:41:28 +0000 (17:41 -0700)]
git-diff-tree: don't use diffcore_pathspec()

diff-tree does the culling of uninteresting paths internally, and
fundamentally has to do so for performance reasons. So there's no
point in calling the separate pathname culling logic here,
especially as it seems slightly broken.

19 years ago[PATCH] fix and testcase for git-commit-tree option
Rene Scharfe [Thu, 26 May 2005 23:03:26 +0000 (01:03 +0200)]
[PATCH] fix and testcase for git-commit-tree option

Actually use GIT_COMMITTER_DATE in git-commit-tree.

(It used to mistakenly re-use the author date)

Add test-case for it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Make ls-* output consistent with diff-* output format.
Junio C Hamano [Thu, 26 May 2005 21:38:19 +0000 (14:38 -0700)]
[PATCH] Make ls-* output consistent with diff-* output format.

Use SP as the column separator except the ones before path which
uses TAB, to make the output format consistent across ls-* and
diff-* commands.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ls-tree matching multiple paths
Jason McMullan [Thu, 26 May 2005 17:52:50 +0000 (10:52 -0700)]
[PATCH] ls-tree matching multiple paths

Enhance git-ls-tree to allow optional 'match paths' that
restricts the output of git-ls-tree.  This is useful to retrieve
a single file's SHA1 out of a tree without creating an index.

[JC: I added the test case]

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add git-external-diff-script
Junio C Hamano [Thu, 26 May 2005 09:31:05 +0000 (02:31 -0700)]
[PATCH] Add git-external-diff-script

This is a demonstration of GIT_EXTERNAL_DIFF mechanism, and a
testbed for tweaking and enhancing what the built-in diff should
do.  This script is designed to output exactly the same output
as what the built-in diff driver produces when used as the
GIT_EXTERNAL_DIFF command.

I've run this and updated built-in diff on the entire history of
linux-2.6 git repository, and JG's udev.git repository which has
interesting symlink cases to make sure it is equivalent to the
built-in diff driver.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Diff updates to express type changes
Junio C Hamano [Thu, 26 May 2005 09:24:30 +0000 (02:24 -0700)]
[PATCH] Diff updates to express type changes

With the introduction of type 'T' in the diff-raw output, and
the "apply-patch" program Linus has been quietly working on
without much advertisement, it started to make sense to emit
usable information in the "diff --git" patch output format as
well.  Earlier built-in diff driver punted and did not say
anything about a symbolic link changing into a file or vice
versa, but this version represents it as a pair of deletion
and creation.

It also fixes a minor problem dealing with old archive created
with ancient git.  The earlier code was reporting file mode
change between 100664 and 100644 (we shouldn't).  The linux-2.6
git tree has a good example that exposes this problem.  A good
test case is commit ce1dc02f76432a46db149241e015a4f782974623.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-apply: add "--check" option to check that the diff makes sense
Linus Torvalds [Thu, 26 May 2005 22:10:02 +0000 (15:10 -0700)]
git-apply: add "--check" option to check that the diff makes sense

It currently only verifies the index against the working directory,
it doesn't actually verify the diff fragments themselves yet.

19 years agogit-apply: when validating default names, check the final EOLN too
Linus Torvalds [Thu, 26 May 2005 20:28:42 +0000 (13:28 -0700)]
git-apply: when validating default names, check the final EOLN too

This means that filenames are totally unambiguous even if they
have spaces or tabs in them.

19 years agogit-apply: pick up default filenames from "diff --git" header line
Linus Torvalds [Thu, 26 May 2005 20:11:24 +0000 (13:11 -0700)]
git-apply: pick up default filenames from "diff --git" header line

Pure mode changes, and deletes or creates of empty files won't have this
information anywhere else.

19 years agogit-apply: make the diffstat output happen for "--stat" only.
Linus Torvalds [Thu, 26 May 2005 19:25:52 +0000 (12:25 -0700)]
git-apply: make the diffstat output happen for "--stat" only.

Slowly this is takign the form of a program that we'd actually
use. Now "git-apply --stat" basically ends up being a perfectly
useful diffstat.

19 years agogit-apply: implement "diffstat" output
Linus Torvalds [Thu, 26 May 2005 18:40:43 +0000 (11:40 -0700)]
git-apply: implement "diffstat" output

Hey, it's almost free by now, and it's a good way to see that
we parse the patches correctly.

19 years agogit-apply: parse the whole list of patches into memory first
Linus Torvalds [Thu, 26 May 2005 17:23:51 +0000 (10:23 -0700)]
git-apply: parse the whole list of patches into memory first

Make it a clear two-phase thing: first a read-only parse of
the patch itself (which is independent of any current index
information), and then the second phase actually uses the patch.

The second phase might not be a real apply, it could be just a
diffstat, for example. Which is trivial to do once the patch is
parsed.

19 years ago[PATCH] Test case portability fix.
Mark Allen [Thu, 26 May 2005 02:11:31 +0000 (19:11 -0700)]
[PATCH] Test case portability fix.

This is the remainder of testcase fix by Mark Allen to make them
work on his Darwin box.  I was using "xargs -r" (GNU) where it
was not needed, sed -ne '/^\(author\|committer\)/s|>.*|>|p'
where some sed does not know what to do with '\|', and also
"cmp - file" to compare standard input with a file, which his
cmp does not support.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake "parse_object()" also fill in commit message buffer data.
Linus Torvalds [Thu, 26 May 2005 02:26:28 +0000 (19:26 -0700)]
Make "parse_object()" also fill in commit message buffer data.

And teach fsck to free it to save memory.

19 years agogit-rev-list: add "end" commit and "--header" flag
Linus Torvalds [Thu, 26 May 2005 01:29:09 +0000 (18:29 -0700)]
git-rev-list: add "end" commit and "--header" flag

The "end" commit is just faking it right now, it's sorting things
purely by date, so this is _not_ a reachability analysis. Some day.

The "--header" flag causes the commit message to be printed out,
with a NUL character separator after it for parseability. This
allows you to do things like use "grep -z" to grep for certain
authors etc.

19 years agocommit: save the commit buffer off when parsing a commit
Linus Torvalds [Thu, 26 May 2005 01:27:14 +0000 (18:27 -0700)]
commit: save the commit buffer off when parsing a commit
object.

A fair number of the users potentially want to look at the
commit objects more closely, and if you worry about memory
leaking in certain applications, you can always do a

free(commit->buffer);
commit->buffer = NULL;

by hand after parsing them.

19 years agounpack_sha1_file: zero-pad the unpacked object.
Linus Torvalds [Thu, 26 May 2005 01:25:08 +0000 (18:25 -0700)]
unpack_sha1_file: zero-pad the unpacked object.

This makes them easier to parse without having to worry about
running off the end, and allows us to treat commits as normal
strings.

19 years ago[PATCH] Mode only changes from diff.
Junio C Hamano [Wed, 25 May 2005 23:00:04 +0000 (16:00 -0700)]
[PATCH] Mode only changes from diff.

This fixes another bug.

 - Mode-only changes were pruned incorrectly from the output.
 - Added test to catch the above problem.
 - Normalize rename/copy similarity score in the diff-raw output
   to per-cent, no matter what scale we internally use.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix type-change handling when assigning the status code to filepairs.
Junio C Hamano [Wed, 25 May 2005 22:07:08 +0000 (15:07 -0700)]
[PATCH] Fix type-change handling when assigning the status code to filepairs.

The interim single-liner '?' fix resulted delete entries that
should not have emitted coming out in the output as an
unintended side effect; I caught this with the "rename" test in
the test suite.  This patch instead fixes the code that assigns
the status code to each filepair.

I verified this does not break the testcase in udev.git tree Kay
Sievers gave us, by running git-diff-tree on that tree which
showed 21 file to symlink changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Adjust show-files test for dotfiles.
Junio C Hamano [Wed, 25 May 2005 22:06:50 +0000 (15:06 -0700)]
[PATCH] Adjust show-files test for dotfiles.

The earlier test was relying on the fact that dotfiles do not
appear in the output to prepare expected test results, which
inevitably got broken when we started handling dotfiles.  Change
the test to be honest about what "--other" file it creates.

The problem was originally pointed out by Mark Allen.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-pull-script: pretty-print the merge head information
Linus Torvalds [Wed, 25 May 2005 21:05:13 +0000 (14:05 -0700)]
git-pull-script: pretty-print the merge head information

This also drops the common ".git" part from the end of the repo
name, and if a non-default head reference is given, makes a nicer
commit message about it.

19 years ago[PATCH] optimize git-resolve-script
Jeff Garzik [Wed, 25 May 2005 17:21:09 +0000 (13:21 -0400)]
[PATCH] optimize git-resolve-script

This change was suggested for my git-switch-tree script, and the same
issues apply to core git's git-resolve-script as well.

19 years agodiff.c: don't silently ignore unknown state changes in diffs.
Linus Torvalds [Wed, 25 May 2005 18:09:12 +0000 (11:09 -0700)]
diff.c: don't silently ignore unknown state changes in diffs.

Give them an "unknown" status, ie '?'.

19 years ago[PATCH] show changed tree objects with recursive git-diff-tree
Junio C Hamano [Wed, 25 May 2005 06:24:22 +0000 (23:24 -0700)]
[PATCH] show changed tree objects with recursive git-diff-tree

This adds a "-t" flag to tell the raw diff output to include the tree
objects in the output when doing a recursive diff.

Since that's how the non-recursive output already handles trees and the
flag thus doesn't make sense without "-r", I made "-t" imply "-r".

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Use pathspec array correctly
Junio C Hamano [Wed, 25 May 2005 06:35:38 +0000 (23:35 -0700)]
[PATCH] Use pathspec array correctly

Oh, I am an idiot.  Repeating the same check against the first
element of pathspec array as many times as the pathspec array
has elements in it would not do us any good.

This patch allows you to specify more than one pathspec to
diff-tree family and have them actually used.

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