git
19 years ago[PATCH] Start cvs-migration documentation
Junio C Hamano [Mon, 6 Jun 2005 00:46:06 +0000 (17:46 -0700)] 
[PATCH] Start cvs-migration documentation

This does a section to talk about "cvs annotate".

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-read-tree: -u without -m is meaningless. Don't allow it.
Linus Torvalds [Tue, 7 Jun 2005 22:20:39 +0000 (15:20 -0700)] 
git-read-tree: -u without -m is meaningless. Don't allow it.

Also, documetn the "-u" in the usage string.

19 years agogit-read-tree: make one-way merge also honor the "update" flag
Linus Torvalds [Tue, 7 Jun 2005 22:17:33 +0000 (15:17 -0700)] 
git-read-tree: make one-way merge also honor the "update" flag

It didn't set CE_UPDATE before, so "-u" was a no-op.

19 years ago[PATCH] read-tree: update documentation for 3-way merge.
Junio C Hamano [Tue, 7 Jun 2005 21:35:43 +0000 (14:35 -0700)] 
[PATCH] read-tree: update documentation for 3-way merge.

This explains the new merge world order that formally assigns
specific meaning to each of three tree-ish command line
arguments.  It also mentions -u option

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd CVS import scripts and programs
Linus Torvalds [Tue, 7 Jun 2005 22:11:28 +0000 (15:11 -0700)] 
Add CVS import scripts and programs

This gets the "cvs2git" program from the old git-tools
archive, and adds a nice script around it that makes it
much easier to use.

With this, you should be able to import a CVS archive
using just a simple

git cvsimport <cvsroot> <module>

and you're done. At least it worked for my one single test.

NOTE!! This may need tweaking. It currently expects (and
verifies) that cvsps version 2.1 is installed, but you
can't actually set any of the cvsps parameters, like the
time fuzz.

19 years agogit-ssh-push/pull: usability improvements
Linus Torvalds [Tue, 7 Jun 2005 21:23:46 +0000 (14:23 -0700)] 
git-ssh-push/pull: usability improvements

Allow traditional ssh path specifiers (host:path), and let the user
override the command name on the other end.

With this, I can push to kernel.org with this script

export GIT_SSH_PULL=/home/torvalds/bin/git-ssh-pull
git-ssh-push -a -v -w heads/master heads/master master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

which while not pretty is at least workable.

19 years ago[PATCH] Use ntohs instead of htons to convert ce_flags to host byte order
Timo Hirvonen [Tue, 7 Jun 2005 20:35:56 +0000 (20:35 +0000)] 
[PATCH] Use ntohs instead of htons to convert ce_flags to host byte order

Use ntohs instead of htons to convert ce_flags to host byte order

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] read-tree: save more user hassles during fast-forward.
Junio C Hamano [Tue, 7 Jun 2005 18:36:30 +0000 (11:36 -0700)] 
[PATCH] read-tree: save more user hassles during fast-forward.

This implements the "never lose the current cache information or
the work tree state, but favor a successful merge over merge
failure" principle in the fast-forward two-tree merge operation.

It comes with a set of tests to cover all the cases described in
the case matrix found in the new documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Document git-ssh-pull and git-ssh-push
Daniel Barkalow [Tue, 7 Jun 2005 02:30:39 +0000 (22:30 -0400)] 
[PATCH] Document git-ssh-pull and git-ssh-push

This fixes the documentation for git-ssh-push, as called by users (if you
run git-ssh-pull or git-ssh-push on one machine, the other runs on the
other machine, and they transfer data in the specified direction).

This also adds documentation for the -w option and for using filenames for
the commit-id (which does what you'd want: uses the source side's value,
not the value already on the target, even if you're running it on the
target).

It also credits me with the programs and the documentation for
git-ssh-push.

Someone who knows asciidoc should make sure I didn't mess up the
formatting. I'm only sure of the ascii part.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-resolve-script: stop when the automated merge fails
Linus Torvalds [Tue, 7 Jun 2005 02:37:25 +0000 (19:37 -0700)] 
git-resolve-script: stop when the automated merge fails

No point in doing a tree write that will just throw
confusing messages on the screen.

19 years agoMake fetch/pull scripts terminate cleanly on errors
Linus Torvalds [Tue, 7 Jun 2005 00:40:22 +0000 (17:40 -0700)] 
Make fetch/pull scripts terminate cleanly on errors

Don't continue with a merge if the fetch failed.

19 years agogit-resolve-script: don't wait for three seconds any more
Linus Torvalds [Tue, 7 Jun 2005 00:39:14 +0000 (17:39 -0700)] 
git-resolve-script: don't wait for three seconds any more

We used to overwrite peoples dirty state.  We don't any more.  So don't
print the scary message and don't delay, just do the update already.

19 years ago[PATCH] -w support for git-ssh-pull/push
Daniel Barkalow [Mon, 6 Jun 2005 20:43:27 +0000 (16:43 -0400)] 
[PATCH] -w support for git-ssh-pull/push

This adds support for -w to git-ssh-pull and git-ssh-push to make
receiving side write the commit that was transferred to a reference file.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Generic support for pulling refs
Daniel Barkalow [Mon, 6 Jun 2005 20:38:26 +0000 (16:38 -0400)] 
[PATCH] Generic support for pulling refs

This adds support to pull.c for requesting a reference and writing it to a
file. All of the git-*-pull programs get stubs for now.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] rsh.c environment variable
Daniel Barkalow [Mon, 6 Jun 2005 20:35:02 +0000 (16:35 -0400)] 
[PATCH] rsh.c environment variable

rsh.c used to set the environment variable for the object database when
invoking the remote command. Now that there is a GIT_DIR variable, use
that instead.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Operations on refs
Daniel Barkalow [Mon, 6 Jun 2005 20:31:29 +0000 (16:31 -0400)] 
[PATCH] Operations on refs

This patch adds code to read a hash out of a specified file under
{GIT_DIR}/refs/, and to write such files atomically and optionally with an
compare and lock.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-read-tree: some "final" cleanups
Linus Torvalds [Mon, 6 Jun 2005 21:33:11 +0000 (14:33 -0700)] 
git-read-tree: some "final" cleanups

Looking good, but hey, it's not like I even have a real testcase for any
of this.  But unlike the mess that this was yerstday, today read-cache
is pretty readable and understandable.  Which is always a good sign.

19 years agogit-read-tree: simplify merge loops enormously
Linus Torvalds [Mon, 6 Jun 2005 21:01:58 +0000 (14:01 -0700)] 
git-read-tree: simplify merge loops enormously

Stop trying to haev this stateful thing that keeps track of what it has
seen, and use a much simpler "gather all the different stages with the
same name together and just merge them in one go" approach.

Makes it a lot more understandable, and allows the different merge
algorithms to share the basic merge loop.

19 years ago[PATCH] index locking like everybody else
Junio C Hamano [Mon, 6 Jun 2005 19:20:55 +0000 (12:20 -0700)] 
[PATCH] index locking like everybody else

This patch teaches read-tree how to use the index file locking
helpers the same way "checkout-cache -u" and "update-cache" do.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoAdd "__noreturn__" attribute to die() and usage()
Linus Torvalds [Mon, 6 Jun 2005 17:12:31 +0000 (10:12 -0700)] 
Add "__noreturn__" attribute to die() and usage()

Only with gcc. It fixes some warnings for certain versions
of gcc, but not apparently all.

19 years agogit-rev-list: make sure to link with ssl libraries
Linus Torvalds [Mon, 6 Jun 2005 16:09:43 +0000 (09:09 -0700)] 
git-rev-list: make sure to link with ssl libraries

Needed for the bignum stuff used by merge-order.

19 years ago[PATCH] Modify git-rev-list to linearise the commit history in merge order.
jon@blackcubes.dyndns.org [Mon, 6 Jun 2005 15:39:40 +0000 (15:39 +0000)] 
[PATCH] Modify git-rev-list to linearise the commit history in merge order.

This patch linearises the GIT commit history graph into merge order
which is defined by invariants specified in Documentation/git-rev-list.txt.

The linearisation produced by this patch is superior in an objective sense
to that produced by the existing git-rev-list implementation in that
the linearisation produced is guaranteed to have the minimum number of
discontinuities, where a discontinuity is defined as an adjacent pair of
commits in the output list which are not related in a direct child-parent
relationship.

With this patch a graph like this:

a4 ---
| \   \
|  b4 |
|/ |  |
a3 |  |
|  |  |
a2 |  |
|  |  c3
|  |  |
|  |  c2
|  b3 |
|  | /|
|  b2 |
|  |  c1
|  | /
|  b1
a1 |
|  |
a0 |
| /
root

Sorts like this:

= a4
| c3
| c2
| c1
^ b4
| b3
| b2
| b1
^ a3
| a2
| a1
| a0
= root

Instead of this:

= a4
| c3
^ b4
| a3
^ c2
^ b3
^ a2
^ b2
^ c1
^ a1
^ b1
^ a0
= root

A test script, t/t6000-rev-list.sh, includes a test which demonstrates
that the linearisation produced by --merge-order has less discontinuities
than the linearisation produced by git-rev-list without the --merge-order
flag specified. To see this, do the following:

cd t
./t6000-rev-list.sh
cd trash
cat actual-default-order
cat actual-merge-order

The existing behaviour of git-rev-list is preserved, by default. To obtain
the modified behaviour, specify --merge-order or --merge-order --show-breaks
on the command line.

This version of the patch has been tested on the git repository and also on the linux-2.6
repository and has reasonable performance on both - ~50-100% slower than the original algorithm.

This version of the patch has incorporated a functional equivalent of the Linus' output limiting
algorithm into the merge-order algorithm itself. This operates per the notes associated
with Linus' commit 337cb3fb8da45f10fe9a0c3cf571600f55ead2ce.

This version has incorporated Linus' feedback regarding proposed changes to rev-list.c.
(see: [PATCH] Factor out filtering in rev-list.c)

This version has improved the way sort_first_epoch marks commits as uninteresting.

For more details about this change, refer to Documentation/git-rev-list.txt
and http://blackcubes.dyndns.org/epoch/.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoFix off-by-one in new three-way-merge updates
Linus Torvalds [Mon, 6 Jun 2005 06:38:18 +0000 (23:38 -0700)] 
Fix off-by-one in new three-way-merge updates

That's the final one ("Yeah, sure, we believe you").

Anyway, at least the tests pass, which is not saying a lot, since they
don't end up testing all the new the things that the new merge world
order tries to do. But hopefully we're now at least not any worse off
than we were before the rewrite.

19 years ago[PATCH] 3-way merge tests for new "git-read-tree -m"?
Junio C Hamano [Mon, 6 Jun 2005 06:18:16 +0000 (23:18 -0700)] 
[PATCH] 3-way merge tests for new "git-read-tree -m"?

The updated git-tread-tree -m is more strict in that it wants to
have the original cache up to date.  The initial part of t1000
(merge tests from hell) fails due to it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoThree-way merge: fix silly bug that made trivial merges not work
Linus Torvalds [Mon, 6 Jun 2005 06:32:53 +0000 (23:32 -0700)] 
Three-way merge: fix silly bug that made trivial merges not work

Making the main loop look more like the one- and two-way cases
introduced a bug where "src" had been updated early, but later
users hadn't been adjusted to match.

19 years agoFix entry.c dependency and compile problem
Linus Torvalds [Mon, 6 Jun 2005 06:15:40 +0000 (23:15 -0700)] 
Fix entry.c dependency and compile problem

Bad Linus.

19 years agogit-read-tree: fix up two-way merge
Linus Torvalds [Mon, 6 Jun 2005 05:59:59 +0000 (22:59 -0700)] 
git-read-tree: fix up two-way merge

This is starting to look better.

19 years agoMore work on merging with git-read-tree..
Linus Torvalds [Mon, 6 Jun 2005 05:07:31 +0000 (22:07 -0700)] 
More work on merging with git-read-tree..

Add a "-u" flag to update the tree as a result of a merge.

Right now this code is way too anal about things, and fails merges it
shouldn't, but let me fix up the different cases and this will allow for
much smoother merging even in the presense of dirty data in the working
tree.

19 years agoMake fiel checkout function available to the git library
Linus Torvalds [Mon, 6 Jun 2005 04:59:54 +0000 (21:59 -0700)] 
Make fiel checkout function available to the git library

The merge stuff will want it soon, and we don't want to
duplicate all the work..

19 years agogit-read-tree: fix up three-way merge tests
Linus Torvalds [Mon, 6 Jun 2005 03:28:33 +0000 (20:28 -0700)] 
git-read-tree: fix up three-way merge tests

When we collapse three entries, we need to check all of the
collapsed entries against the old pre-merge state.

19 years agogit-read-tree: be a lot more careful about merging dirty trees
Linus Torvalds [Mon, 6 Jun 2005 03:02:31 +0000 (20:02 -0700)] 
git-read-tree: be a lot more careful about merging dirty trees

We don't want to overwrite state that we haven't committed yet
when merging, so it's better to make git-read-tree fail than
end up with a merge tree that ends up not having the dirty changes.

Update git-resolve-script to fail cleanly when git-read-tree fails.

19 years ago[PATCH] Make git-update-cache --force-remove regular
Petr Baudis [Tue, 31 May 2005 16:52:43 +0000 (18:52 +0200)] 
[PATCH] Make git-update-cache --force-remove regular

Make the --force-remove flag behave same as --add, --remove and
--replace. This means I can do

git-update-cache --force-remove -- file1.c file2.c

which is probably saner and also makes it easier to use in cg-rm.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull
Junio C Hamano [Sun, 5 Jun 2005 22:41:05 +0000 (15:41 -0700)] 
[PATCH] rename git-rpush and git-rpull to git-ssh-push and git-ssh-pull

In preparation for 1.0 release, this makes the command names
consistent with others in git-*-pull family.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agodiff 'rename' format change.
Linus Torvalds [Sun, 5 Jun 2005 22:31:52 +0000 (15:31 -0700)] 
diff 'rename' format change.

Clearly even Junio felt git "rename" header lines should say "from/to"
instead of "old/new", since he wrote the documentation that way.

This way it also matches "copy".

git-apply will accept both versions, at least for a while.

19 years agogit-apply: consider it an error to apply no changes
Linus Torvalds [Sun, 5 Jun 2005 22:25:28 +0000 (15:25 -0700)] 
git-apply: consider it an error to apply no changes

A "--stat" or a "--check" will just be quiet, but if
you try to apply something with no changes, that's an
error.

19 years ago[PATCH] Documentation: describe git extended diff headers.
Junio C Hamano [Sun, 5 Jun 2005 21:39:49 +0000 (14:39 -0700)] 
[PATCH] Documentation: describe git extended diff headers.

The documentation failed to describe "diff --git" extended diff
headers, so add some.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Documentation: describe diff tweaking.
Junio C Hamano [Sun, 5 Jun 2005 21:30:58 +0000 (14:30 -0700)] 
[PATCH] Documentation: describe diff tweaking.

This adds documentation for the diffcore mechanism and explains
how numeric parameters to -B/-C/-M options affect the output,
which was left "black magic" so far.

The documentation is not connected to any of the other asciidoc
nodes yet.  Awaiting for suggestions, fixes and help from other
people.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-apply: fix rename header parsing
Linus Torvalds [Sun, 5 Jun 2005 21:26:50 +0000 (14:26 -0700)] 
git-apply: fix rename header parsing

It's not "rename from" and "rename to", it's "rename old" and "rename new".

Which is illogical and doesn't match the "copy from/to" case, but that's
life. Maybe Junio will fix it up one of these days.

19 years ago[PATCH] pull: gracefully recover from delta retrieval failure.
Junio C Hamano [Sun, 5 Jun 2005 06:11:38 +0000 (23:11 -0700)] 
[PATCH] pull: gracefully recover from delta retrieval failure.

This addresses a concern raised by Jason McMullan in the mailing
list discussion.  After retrieving and storing a potentially
deltified object, pull logic tries to check and fulfil its delta
dependency.  When the pull procedure is killed at this point,
however, there was no easy way to recover by re-running pull,
since next run would have found that we already have that
deltified object and happily reported success, without really
checking its delta dependency is satisfied.

This patch introduces --recover option to git-*-pull family
which causes them to re-validate dependency of deltified objects
we are fetching.  A new test t5100-delta-pull.sh covers such a
failure mode.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diffcore-break.c: various fixes.
Junio C Hamano [Sat, 4 Jun 2005 06:05:57 +0000 (23:05 -0700)] 
[PATCH] diffcore-break.c: various fixes.

This fixes three bugs in the -B heuristics.

 - Although it was advertised that the initial break criteria
   used was the same as what diffcore-rename uses, it was using
   something different.  Instead of using smaller of src and dst
   size to compare with "edit" size, (insertion and deletion),
   it was using larger of src and dst, unlike the rename/copy
   detection logic.  This caused the parameter to -B to mean
   something different from the one to -M and -C.  To compensate
   for this change, the default break score is also changed to
   match that of the default for rename/copy.

 - The code would have crashed with division by zero when trying
   to break an originally empty file.

 - Contrary to what the comment said, the algorithm was breaking
   small files, only to later merge them together.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff.c: -B argument passing fix.
Junio C Hamano [Sat, 4 Jun 2005 06:04:07 +0000 (23:04 -0700)] 
[PATCH] diff.c: -B argument passing fix.

This fixes a bug that was preventing non-default parameter to -B
option to be passed correctly; you could not give more than 50%
break score.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff.c: locate_size_cache() fix.
Junio C Hamano [Sat, 4 Jun 2005 06:02:23 +0000 (23:02 -0700)] 
[PATCH] diff.c: locate_size_cache() fix.

This fixes two bugs.

 - declaration of auto variable "cmp" was preceeded by a
   statement, causing compilation error on real C compilers;
   noticed and patch given by Yoichi Yuasa.

 - the function's calling convention was overloading its size
   parameter to mean "largest possible value means do not add
   entry", which was a bad taste.  Brought up during a
   discussion with Peter Baudis.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-apply: actually apply patches and update the index
Linus Torvalds [Sun, 5 Jun 2005 21:05:43 +0000 (14:05 -0700)] 
git-apply: actually apply patches and update the index

We update the index only if the "--index" flag is given,
so you can actually use this as a strange kind of "patch"
program even for non-git usage. Not that you'd likely
want to, but it comes in handy for testing.

This _should_ more or less get everythign right, but as
usual I leave the testing to the usrs..

19 years agogit-apply: fix apply of a new file
Linus Torvalds [Sun, 5 Jun 2005 19:43:56 +0000 (12:43 -0700)] 
git-apply: fix apply of a new file

(And fix name handling for when we have an implied
create or delete event from a traditional diff).

19 years agogit-apply: find offset fragments, and really apply them
Linus Torvalds [Sun, 5 Jun 2005 19:16:32 +0000 (12:16 -0700)] 
git-apply: find offset fragments, and really apply them

This applies the fragments in memory, but doesn't actually
write the results out to the files yet. But we now do all the
difficult parts, the rest is just basically writing the
results out and updating the index.

19 years agogit-apply: first cut at actually checking fragment data
Linus Torvalds [Sun, 5 Jun 2005 18:03:13 +0000 (11:03 -0700)] 
git-apply: first cut at actually checking fragment data

Right now it requires that the fragment offsets be exact,
and it doesn't actually apply the fragment yet, but it
does find where it goes and verify the data.

Next step: actually applying the fragment changes.

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.