15 years agoAdd a "git-show-index" helper that shows the contents of a pack index
Linus Torvalds [Wed, 6 Jul 2005 00:08:02 +0000 (17:08 -0700)]
Add a "git-show-index" helper that shows the contents of a pack index

This was invaluable for debugging the zero-sized compression issue, and
might be useful for scripting too, if people want to see the contents of
a pack.

15 years agoDon't special-case a zero-sized compression.
Linus Torvalds [Wed, 6 Jul 2005 00:06:09 +0000 (17:06 -0700)]
Don't special-case a zero-sized compression.

zlib actually writes a header for that case, and while ignoring that
header will get us the right data, it will also end up messing up our
stream position.  So we actually want zlib to "uncompress" even an empty

15 years agoMake "git clone" use the new git-clone-pack
Linus Torvalds [Tue, 5 Jul 2005 22:47:34 +0000 (15:47 -0700)]
Make "git clone" use the new git-clone-pack

15 years agoAdd "git-clone-pack" program to help with "git clone"
Linus Torvalds [Tue, 5 Jul 2005 22:45:37 +0000 (15:45 -0700)]
Add "git-clone-pack" program to help with "git clone"

15 years agoFix silly thinko in "head_ref()"
Linus Torvalds [Tue, 5 Jul 2005 22:45:00 +0000 (15:45 -0700)]
Fix silly thinko in "head_ref()"

It did a "for_each_ref()" in addition to the HEAD case, which was a
left-over from an early broken test.

15 years agoMove "get_ack()" to common git_connect functions
Linus Torvalds [Tue, 5 Jul 2005 22:44:09 +0000 (15:44 -0700)]
Move "get_ack()" to common git_connect functions

git-clone-pack will want it too. Soon.

15 years agoRemove multi-head support from fetch-pack
Linus Torvalds [Tue, 5 Jul 2005 21:39:30 +0000 (14:39 -0700)]
Remove multi-head support from fetch-pack

It was a misguided attempt to mix fetching and cloning. I'll make
a separate clone thing.

15 years agoRemove unnecessary usage of strncmp() in git-rev-list arg parsing.
Linus Torvalds [Tue, 5 Jul 2005 19:12:50 +0000 (12:12 -0700)]
Remove unnecessary usage of strncmp() in git-rev-list arg parsing.

Not only is it unnecessary, it incorrectly allows extraneous characters
at the end of the argument.

Junio noticed the --merge-order thing, and Jon points out that if we fix
that one, we should fix --show-breaks too.

15 years agoMerge head 'cvs2git' of
Linus Torvalds [Tue, 5 Jul 2005 19:03:14 +0000 (12:03 -0700)]
Merge head 'cvs2git' of

15 years agoWork around git-http-pull breakage in git-fetch-script
Linus Torvalds [Tue, 5 Jul 2005 19:02:10 +0000 (12:02 -0700)]
Work around git-http-pull breakage in git-fetch-script

Need to add a final slash.  And make it verbose by default, since it's
so slow that otherwise people will think it's died.

15 years agogit-fetch-script: use git-fetch-pack for local and ssh fetches.
Linus Torvalds [Tue, 5 Jul 2005 18:38:37 +0000 (11:38 -0700)]
git-fetch-script: use git-fetch-pack for local and ssh fetches.

Also, clean it up a lot.

15 years agoAdd "git_path()" and "head_ref()" helper functions.
Linus Torvalds [Tue, 5 Jul 2005 18:31:32 +0000 (11:31 -0700)]
Add "git_path()" and "head_ref()" helper functions.

"git_path()" returns a static pathname pointer into the git directory
using a printf-like format specifier.

"head_ref()" works like "for_each_ref()", except for just the HEAD.

15 years agoMerge with Linus' current tree
Matthias Urlichs [Tue, 5 Jul 2005 13:32:29 +0000 (15:32 +0200)]
Merge with Linus' current tree

15 years agoMerge with
Matthias Urlichs [Tue, 5 Jul 2005 12:23:36 +0000 (14:23 +0200)]
Merge ...

15 years agocvsimport: getopt accepted a -q option (undocumented and unused).
Matthias Urlichs [Tue, 5 Jul 2005 12:22:53 +0000 (14:22 +0200)]
cvsimport: getopt accepted a -q option (undocumented and unused).

15 years agogit-cvsimport-script: move working directory forward
Sven Verdoolaege [Tue, 5 Jul 2005 11:19:59 +0000 (13:19 +0200)]
git-cvsimport-script: move working directory forward

If HEAD happened to point to a cvs branch, move the
working directory forward to the tip of the branch.
Additionally, if master and "origin" are equal,
move master forward to new origin first.

15 years agogit-rev-list: make sure the output is sorted by recency
Linus Torvalds [Mon, 4 Jul 2005 23:49:37 +0000 (16:49 -0700)]
git-rev-list: make sure the output is sorted by recency

We didn't sort the refs by date, so if you had multiple refs, the end
result would not be properly sorted.

15 years agoMake rev-list flush the stdio buffers after each rev.
Linus Torvalds [Mon, 4 Jul 2005 23:36:48 +0000 (16:36 -0700)]
Make rev-list flush the stdio buffers after each rev.

We'd rather get the revisions in a slow but timely manner than
have to wait for them.

15 years agoMake git-fetch-pack actually do all the unpacking etc.
Linus Torvalds [Mon, 4 Jul 2005 23:35:13 +0000 (16:35 -0700)]
Make git-fetch-pack actually do all the unpacking etc.

It returns the result SHA1 on stdout, so you can do

remote=$(git-fetch-pack host:dir branchname)

and it will unpack the objects and "remote" will be the SHA1 name of the
branch on the other side.  You can then save that off, or merge it, or

15 years agoMake git-fetch-pack and git-upload-pack negotiate needs/haves fully
Linus Torvalds [Mon, 4 Jul 2005 22:29:17 +0000 (15:29 -0700)]
Make git-fetch-pack and git-upload-pack negotiate needs/haves fully

Now the only piece missing is actually generating the pack-file.

15 years agoClean up output of "for_each_ref()" when GIT_DIR is "."
Linus Torvalds [Mon, 4 Jul 2005 22:28:19 +0000 (15:28 -0700)]
Clean up output of "for_each_ref()" when GIT_DIR is "."

Remove the "./" at the head, it just looks much nicer.

15 years agogit-cvsimport-script: remove unused variable
Sven Verdoolaege [Mon, 4 Jul 2005 21:18:35 +0000 (23:18 +0200)]
git-cvsimport-script: remove unused variable

15 years agoCommit first cut at "git-fetch-pack"
Linus Torvalds [Mon, 4 Jul 2005 20:26:53 +0000 (13:26 -0700)]
Commit first cut at "git-fetch-pack"

It's meant to be used by "git fetch" for the local and ssh case.

It doesn't actually do the fetching now, but it does discover the common
commit point.

15 years agoMove ref path matching to connect.c library
Linus Torvalds [Mon, 4 Jul 2005 20:24:30 +0000 (13:24 -0700)]
Move ref path matching to connect.c library

It's a generic thing for matching refs from the other side.

15 years agoFactor out the ssh connection stuff from send-pack.c
Linus Torvalds [Mon, 4 Jul 2005 18:57:58 +0000 (11:57 -0700)]
Factor out the ssh connection stuff from send-pack.c

I want to use it for git-fetch-pack too.

15 years agogit-cvsimport-script: more error handling
Sven Verdoolaege [Mon, 4 Jul 2005 15:36:25 +0000 (17:36 +0200)]
git-cvsimport-script: more error handling

15 years ago[PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff85c49620ae2a1722d8d4d37c881a054
Jon Seymour [Mon, 4 Jul 2005 13:15:36 +0000 (23:15 +1000)]
[PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff85c49620ae2a1722d8d4d37c881a054

This patch fixes up the t/t5300 unit tests which were broken by the changes in:

Make the name of a pack-file depend on the objects packed there-in.

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years agogit-cvsimport-script: provide direct support for cvsps -z option
Sven Verdoolaege [Mon, 4 Jul 2005 15:10:06 +0000 (17:10 +0200)]
git-cvsimport-script: provide direct support for cvsps -z option

15 years agogit-cvsimport-script: update cvsps cache instead of rebuilding it
Sven Verdoolaege [Mon, 4 Jul 2005 13:35:30 +0000 (15:35 +0200)]
git-cvsimport-script: update cvsps cache instead of rebuilding it

Updating the cache is sufficient for most purposes.
If users really want to rebuild the cache, they can specify
the option themselves.

15 years agogit-cvsimport-script: fix branch switching
Sven Verdoolaege [Mon, 4 Jul 2005 13:28:36 +0000 (15:28 +0200)]
git-cvsimport-script: fix branch switching

Previous patch broke branch switching.

15 years agogit-cvsimport-script: use private index.
Sven Verdoolaege [Mon, 4 Jul 2005 11:36:59 +0000 (13:36 +0200)]
git-cvsimport-script: use private index.

15 years agogit-rev-parse: support show sha1 names for pack entries
Linus Torvalds [Mon, 4 Jul 2005 04:01:11 +0000 (21:01 -0700)]
git-rev-parse: support show sha1 names for pack entries

This is actually subtly wrong.  If a short match is found in the object
directory, but would _also_ match another SHA1 ID in a pack (or it shows
in one pack but not another), we'll never have done the pack lookup, and
we think it's unique.

I can't find it in myself to care.  You really want to use enough of a
SHA1 that there is never any ambiguity.

15 years agoMake git-rev-parse support cogito-style "short hex names"
Linus Torvalds [Mon, 4 Jul 2005 03:27:06 +0000 (20:27 -0700)]
Make git-rev-parse support cogito-style "short hex names"

Currently only for unpacked objects, but the infrastructure
is there to do it for packed objects too.

15 years agogit-cvsimport-script: leave working directory alone.
Sven Verdoolaege [Sun, 3 Jul 2005 22:43:26 +0000 (00:43 +0200)]
git-cvsimport-script: leave working directory alone.

15 years agoMake the name of a pack-file depend on the objects packed there-in.
Linus Torvalds [Sun, 3 Jul 2005 22:34:04 +0000 (15:34 -0700)]
Make the name of a pack-file depend on the objects packed there-in.

This means that the .git/objects/pack directory is also rsync'able,
since the filenames created there-in are either unique or refer to the
same data.

Otherwise you might not be able to pull from a directory that is partly
packed without having to worry about missing objects due to pack-file
name clashes.

15 years agogit-cvsimport-script: typo head -> heads
Sven Verdoolaege [Sun, 3 Jul 2005 21:40:48 +0000 (23:40 +0200)]
git-cvsimport-script: typo head -> heads

15 years agoAdd "git-prune-packed" that removes objects that exist in a pack.
Linus Torvalds [Sun, 3 Jul 2005 21:27:34 +0000 (14:27 -0700)]
Add "git-prune-packed" that removes objects that exist in a pack.

This, together with "git repack" can be used to clean up unpacked
git archives.

15 years agoAdd "git repack" command that does an incremental pack
Linus Torvalds [Sun, 3 Jul 2005 20:38:01 +0000 (13:38 -0700)]
Add "git repack" command that does an incremental pack

15 years agoAdd "--non-empty" flag to git-pack-objects
Linus Torvalds [Sun, 3 Jul 2005 20:36:58 +0000 (13:36 -0700)]
Add "--non-empty" flag to git-pack-objects

It skips writing the pack-file if it ends up being empty.

15 years ago"git rev-list --unpacked" shows only unpacked commits
Linus Torvalds [Sun, 3 Jul 2005 20:29:54 +0000 (13:29 -0700)]
"git rev-list --unpacked" shows only unpacked commits

More infrastructure to do efficient incremental packs.

15 years agoAdd "--incremental" flag to git-pack-objects
Linus Torvalds [Sun, 3 Jul 2005 20:08:40 +0000 (13:08 -0700)]
Add "--incremental" flag to git-pack-objects

It won't add an object that is already in a pack to the new pack.

15 years agoAdd "--all" flag to rev-parse that shows all refs
Linus Torvalds [Sun, 3 Jul 2005 20:07:52 +0000 (13:07 -0700)]
Add "--all" flag to rev-parse that shows all refs

And make git-rev-list just silently ignore non-commit refs if we're not
asking for all objects.

15 years agoAdd "has_sha1_pack()" function to query whether the object is available in a pack
Linus Torvalds [Sun, 3 Jul 2005 20:06:36 +0000 (13:06 -0700)]
Add "has_sha1_pack()" function to query whether the object is available in a pack

We'll want this for incremental packing.

15 years agoMake git-fsck-cache check HEAD integrity
Linus Torvalds [Sun, 3 Jul 2005 17:40:38 +0000 (10:40 -0700)]
Make git-fsck-cache check HEAD integrity

In particular, check that it's a symlink, and points to refs/heads/.  We
depend on that these days not only for "git checkout", but also because
fsck and others only check for references in the .git/refs/
subdirectory, not things like HEAD itself.

15 years agoFix sparse warnings.
Linus Torvalds [Sun, 3 Jul 2005 17:10:45 +0000 (10:10 -0700)]
Fix sparse warnings.

Mainly making a lot of local functions and variables be marked "static",
but there was a "zero as NULL" warning in there too.

15 years agocvsimport: Missing tests for verbosity flag.
Matthias Urlichs [Sun, 3 Jul 2005 17:03:30 +0000 (19:03 +0200)]
cvsimport: Missing tests for verbosity flag.

15 years agoFix up header file dependencies and add sparse checking rules
Linus Torvalds [Sun, 3 Jul 2005 17:02:35 +0000 (10:02 -0700)]
Fix up header file dependencies and add sparse checking rules

We're pretty sparse-clean already, thanks to earlier efforts, but some
things inevitably creep in.

15 years agoFix up "for_each_ref()" to be more usable, and use it in git-fsck-cache
Linus Torvalds [Sun, 3 Jul 2005 17:01:38 +0000 (10:01 -0700)]
Fix up "for_each_ref()" to be more usable, and use it in git-fsck-cache

It needed to take the GIT_DIR information into account, something that
the original receive-pack usage just never cared about.

15 years agoFix gcc warning in send-pack.c
Linus Torvalds [Sun, 3 Jul 2005 17:00:01 +0000 (10:00 -0700)]
Fix gcc warning in send-pack.c

send_pack() was declared to return "int" (although nobody cared), but
didn't actually return anything.

15 years agoAvoid gcc warnings in sha1_file.c
Linus Torvalds [Sun, 3 Jul 2005 16:58:44 +0000 (09:58 -0700)]
Avoid gcc warnings in sha1_file.c

A couple of bogus "might be used undefined" warnings are avoided
by moving the initializations unnecessarily early.

15 years agoSupport :ext: access method.
Sven Verdoolaege [Sun, 3 Jul 2005 11:02:06 +0000 (13:02 +0200)]
Support :ext: access method.

15 years agoHonour CVS_SERVER.
Sven Verdoolaege [Sun, 3 Jul 2005 10:26:51 +0000 (12:26 +0200)]

15 years agogit-cvsimport-script: clean up documentation
Sven Verdoolaege [Sun, 3 Jul 2005 09:38:06 +0000 (11:38 +0200)]
git-cvsimport-script: clean up documentation

Remove documentation of irrelevant "type" option.

Signed-off-by: Sven Verdoolaege <>
15 years agoMake specification of CVS module to convert optional.
Sven Verdoolaege [Sun, 3 Jul 2005 09:34:59 +0000 (11:34 +0200)]
Make specification of CVS module to convert optional.

If we're inside a checked out CVS repository, there is
no need to explicitly specify the module as it is
available in CVS/Repository.
Also read CVS/Root if it's available and -d is not specified.
Finally, explicitly pass root to cvsps as CVS/Root takes
precedence over CVSROOT.

Signed-off-by: Sven Verdoolaege <>
15 years agoFixed a typo in Documentation/git-cvsimport-script.txt.
Sven Verdoolaege [Sun, 3 Jul 2005 07:43:00 +0000 (09:43 +0200)]
Fixed a typo in Documentation/git-cvsimport-script.txt.

15 years agoGeneralize the "show each ref" code in receice-pack
Linus Torvalds [Sun, 3 Jul 2005 03:23:36 +0000 (20:23 -0700)]
Generalize the "show each ref" code in receice-pack

This turns it into a generic "do xyz for each ref" library function.

15 years ago[PATCH] Show more details of packfile with verify-pack -v.
Junio C Hamano [Fri, 1 Jul 2005 00:17:20 +0000 (17:17 -0700)]
[PATCH] Show more details of packfile with verify-pack -v.

This implements show_pack_info() function used in verify-pack
command when -v flag is used to obtain something like
unpack-objects used to give when it was first written.

It shows the following for each non-deltified object found in
the pack:

    SHA1 type size offset

For deltified objects, it shows this instead:

    SHA1 type size offset depth base_sha1

In order to get the output in the order that appear in the pack
file for debugging purposes, you can do this:

 $ git-verify-pack -v packfile | sort -n -k 4,4

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] verify-pack updates.
Junio C Hamano [Fri, 1 Jul 2005 00:15:39 +0000 (17:15 -0700)]
[PATCH] verify-pack updates.

Nico pointed out that having verify_pack.c and verify-pack.c was
confusing.  Rename verify_pack.c to pack-check.c as suggested,
and enhances the verification done quite a bit.

 - Built-in sha1_file unpacking knows that a base object of a
   deltified object _must_ be in the same pack, and takes
   advantage of that fact.

 - Earlier verify-pack command only checked the SHA1 sum for the
   entire pack file and did not look into its contents.  It now
   checks everything idx file claims to have unpacks correctly.

 - It now has a hook to give more detailed information for
   objects contained in the pack under -v flag.

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Avoid unnecessarily inflating and interpreting delta
Junio C Hamano [Fri, 1 Jul 2005 00:13:07 +0000 (17:13 -0700)]
[PATCH] Avoid unnecessarily inflating and interpreting delta

This teaches packed_delta_info() that it only needs to look at
the type of the base object to figure out both type and size of
a deltified object.  This saves quite a many calls to inflate()
when dealing with a deep delta chain.

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years agocvsimport: add documentation.
Matthias Urlichs [Thu, 30 Jun 2005 20:54:33 +0000 (22:54 +0200)]
cvsimport: add documentation.

15 years agocvsimport: Added option '-p': pass options to cvsps
Matthias Urlichs [Thu, 30 Jun 2005 20:54:01 +0000 (22:54 +0200)]
cvsimport: Added option '-p': pass options to cvsps
           Added option '-x' to cvsps call

15 years agocvsimport: Exit if an existing repository doesn't have the right branch.
Matthias Urlichs [Thu, 30 Jun 2005 20:10:32 +0000 (22:10 +0200)]
cvsimport: Exit if an existing repository doesn't have the right branch.

15 years agocvs import: Strip whitespace at the end of the log entry
Matthias Urlichs [Thu, 30 Jun 2005 20:09:42 +0000 (22:09 +0200)]
cvs import: Strip whitespace at the end of the log entry
            for compatibility with old cvs2git.

15 years agoDo ref matching on the sender side rather than on receiver
Linus Torvalds [Thu, 30 Jun 2005 19:28:24 +0000 (12:28 -0700)]
Do ref matching on the sender side rather than on receiver

This makes the receiver always send a full list of valid refs, which
will allow us to do better packs, as well as handle creation of new
refs.  Eventually.  Right now we just moved the matching and enabled it.

So now you can do

git-send-pack host:path branch1 branch2

to only send branches "branch1" and "branch2".

15 years agoAdd support for "forcing" a ref on the remote side
Linus Torvalds [Thu, 30 Jun 2005 18:04:59 +0000 (11:04 -0700)]
Add support for "forcing" a ref on the remote side

A "old ref" of all zeroes is considered a "don't care" ref, and allows
us to say "write the new ref regardless of what the old ref contained
(or even if it existed at all)".

This allows (if git-send-pack were to do it) creating new refs, and
fixing up old ones.

15 years agogit-send-pack: actually send the object pack
Linus Torvalds [Thu, 30 Jun 2005 17:17:39 +0000 (10:17 -0700)]
git-send-pack: actually send the object pack

This concludes this lesson.  I've actually successfully sent an update
using the git-send-pack command.

Probably tons of work still to do, and nasty debugging, but it's now
actually potentially useful.

15 years agogit-receive-pack: implement ref switch command handling
Linus Torvalds [Thu, 30 Jun 2005 17:15:22 +0000 (10:15 -0700)]
git-receive-pack: implement ref switch command handling

After unpacking the object pack successfully, we go through the list of
refs, and verify that they still contain their expected values.  Then we
replace them with the new ones.

15 years agocvsimport: perform string comparison on "HEAD"
Sven Verdoolaege [Thu, 30 Jun 2005 15:23:22 +0000 (17:23 +0200)]
cvsimport: perform string comparison on "HEAD"

15 years agogit-cvsimport-script: Removed redundant @old and @new clear.
Matthias Urlichs [Thu, 30 Jun 2005 10:28:31 +0000 (12:28 +0200)]
git-cvsimport-script: Removed redundant @old and @new clear.

15 years agogit-cvsimport-script: Remove setting Sticky; it may cause problems
Matthias Urlichs [Thu, 30 Jun 2005 10:19:48 +0000 (12:19 +0200)]
git-cvsimport-script: Remove setting Sticky; it may cause problems

15 years agocvs import: Call git-update-cache multiple times
Matthias Urlichs [Thu, 30 Jun 2005 09:55:57 +0000 (11:55 +0200)]
cvs import: Call git-update-cache multiple times
            instead of with a too-long argument list.

15 years agoAdd comment on what send-pack still needs to do
Linus Torvalds [Thu, 30 Jun 2005 06:07:01 +0000 (23:07 -0700)]
Add comment on what send-pack still needs to do

Me tired.

15 years agogit-receive-pack: start parsing ref update commands
Linus Torvalds [Thu, 30 Jun 2005 06:01:14 +0000 (23:01 -0700)]
git-receive-pack: start parsing ref update commands

We don't act on them yet, but we parse them.

15 years agoSlow but steady progress on git pack receive/send
Linus Torvalds [Thu, 30 Jun 2005 05:50:48 +0000 (22:50 -0700)]
Slow but steady progress on git pack receive/send

15 years agogit-send-pack: start parsing local/remote reference differences
Linus Torvalds [Thu, 30 Jun 2005 05:31:41 +0000 (22:31 -0700)]
git-send-pack: start parsing local/remote reference differences

Right now it just shows which refs it picks up, and whether they are
the same or changed on the remote end. Getting there..

15 years agoTurn on optimization again
Linus Torvalds [Thu, 30 Jun 2005 04:08:21 +0000 (21:08 -0700)]
Turn on optimization again

It got turned off by mistake just because I had been doing debugging,
and committed the Makefile that had other changes ...

15 years ago[PATCH] Remove unnecessary sort from t6001 testcase
Jon Seymour [Thu, 30 Jun 2005 02:41:59 +0000 (12:41 +1000)]
[PATCH] Remove unnecessary sort from t6001 testcase

This patch removes an unnecessary sort from the t6001 testcase.

Sorts were previously necessary when testing non --merge-order cases
because the output order wasn't entirely deterministic unless commit
date was fixed.

However, commit dates are now fixed, so the need for a sort has
disappeared.  So the sort has been removed.

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fix broken t6001 test case
Jon Seymour [Thu, 30 Jun 2005 02:41:57 +0000 (12:41 +1000)]
[PATCH] Fix broken t6001 test case

This fix fixes a t/t6001 test case break that was hidden by a bug in the
test case infrastructure.

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Demonstrate broken t6001 test case function
Jon Seymour [Thu, 30 Jun 2005 02:41:55 +0000 (12:41 +1000)]
[PATCH] Demonstrate broken t6001 test case function

Junio discovered a problem where an actual test case break was hidden
because pipelines are not handled properly by the test infrastructure in

This patch fixes the broken infrastructure (and demonstrates the break

A subsequent patch in this series will fix the test case so that it
doesn't fail.

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fix for git-rev-list --merge-order B ^A (A,B share common base) [rev 2]
Jon Seymour [Thu, 30 Jun 2005 01:51:34 +0000 (11:51 +1000)]
[PATCH] Fix for git-rev-list --merge-order B ^A (A,B share common base) [rev 2]

This patch makes --merge-order produce the same list as git-rev-list
without --merge-order specified.

In particular, if the graph looks like this:

| B

The both git-rev-list B ^A and git-rev-list --merge-order will produce B.

The unit tests have been changed to reflect the fact that the prune
points are now formally part of the start list that is used to perform
the --merge-order sort.

That is: git-rev-list --merge-order A ^D used to produce

= A
| C

It now produces:

^ A
| C

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Test case that demonstrates problem with --merge-order ^ processing
Jon Seymour [Wed, 29 Jun 2005 23:45:30 +0000 (09:45 +1000)]
[PATCH] Test case that demonstrates problem with --merge-order ^ processing

Added a test case that shows that --merge-order doesn't produce the
correct result in the following case.

| B

git-rev-list --merge-order A ^B should produce just A. Instead
it produces BCD.

A subsequent patch will fix this defect.

Signed-off-by: Jon Seymour <>
Signed-off-by: Linus Torvalds <>
15 years agoMake send/receive-pack be closer to doing something interesting
Linus Torvalds [Thu, 30 Jun 2005 03:50:15 +0000 (20:50 -0700)]
Make send/receive-pack be closer to doing something interesting

15 years agoStart of "git-send-pack", the local part of sending off a pack
Linus Torvalds [Thu, 30 Jun 2005 02:09:05 +0000 (19:09 -0700)]
Start of "git-send-pack", the local part of sending off a pack

Like git-receive-pack, this is only partway done.

15 years agoAdd first cut at "git-receive-pack"
Linus Torvalds [Thu, 30 Jun 2005 00:52:11 +0000 (17:52 -0700)]
Add first cut at "git-receive-pack"

It's not working yet, but it's at the point where I want to be able to
track my changes.  The theory of operation is that this is the "remote"
side of a "git push".  It can tell us what references the remote side
has, receives out reference update commands and a pack-file, and can
execute the unpacking command.

15 years agoRemove bogus dup commit warning with --merge-order
Linus Torvalds [Wed, 29 Jun 2005 18:40:58 +0000 (11:40 -0700)]
Remove bogus dup commit warning with --merge-order

It makes gitk unhappy, and besides, non-merge-order doesn't complain, so
why do it here..

15 years agoTeach git-rev-list about non-commit objects
Linus Torvalds [Wed, 29 Jun 2005 18:30:24 +0000 (11:30 -0700)]
Teach git-rev-list about non-commit objects

Now you can give git-rev-list tags, trees and blobs, and it will do the
proper reachability for them all. Knock wood.

Of course, you need the "--objects" flag to do anything but plain

15 years agoPrepare git-rev-list for tracking tag objects too
Linus Torvalds [Wed, 29 Jun 2005 17:40:14 +0000 (10:40 -0700)]
Prepare git-rev-list for tracking tag objects too

We want to be able to just say "give a difference between these
objects", rather than limiting it to commits only.  This isn't there
yet, but it sets things up to be a bit easier.

15 years ago[PATCH] Adjust t5300 test for unpack-objects change
Junio C Hamano [Wed, 29 Jun 2005 06:07:34 +0000 (23:07 -0700)]
[PATCH] Adjust t5300 test for unpack-objects change

It now always read from standard input and rejects non-flag

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years agoRe-instate dry-run logic in git-unpack-objects
Linus Torvalds [Wed, 29 Jun 2005 16:53:20 +0000 (09:53 -0700)]
Re-instate dry-run logic in git-unpack-objects

It can no longer be as verbose, since it doesn't have a good way to
resolve deltas (now that it is purely streaming, it cannot seek around
to read the objects a delta is based on).

But it can check that the thing unpacks cleanly at least as far as pack
syntax goes - all the objects uncompress cleanly, and the pack has the
right final SHA1.

15 years agoClean up git-unpack-objects a bit
Linus Torvalds [Wed, 29 Jun 2005 16:38:02 +0000 (09:38 -0700)]
Clean up git-unpack-objects a bit

I'd like to add back the "dry-run" thing, but it turns out that to do it
well, I'd have to keep all the object data in memory (which is not
acceptable).  So I'll clean it up a bit and make it do as many checks as
it can.

15 years ago[PATCH] Add git-verify-pack command.
Junio C Hamano [Wed, 29 Jun 2005 09:51:27 +0000 (02:51 -0700)]
[PATCH] Add git-verify-pack command.

Given a list of <pack>.idx files, this command validates the
index file and the corresponding .pack file for consistency.

This patch also uses the same validation mechanism in fsck-cache
when the --full flag is used.

During normal operation, sha1_file.c verifies that a given .idx
file matches the .pack file by comparing the SHA1 checksum
stored in .idx file and .pack file as a minimum sanity check.
We may further want to check the pack signature and version when
we map the pack, but that would be a separate patch.

Earlier, errors to map a pack file was not flagged fatal but led
to a random fatal error later.  This version explicitly die()s
when such an error is detected.

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fixlets on top of Nico's clean-up.
Junio C Hamano [Wed, 29 Jun 2005 07:32:11 +0000 (00:32 -0700)]
[PATCH] Fixlets on top of Nico's clean-up.

If we prefer 0 as maxsize for diff_delta() to say "unlimited", let's be
consistent about it.

This patch also fixes type mismatch in a call to get_delta_hdr_size()
from packed_delta_info().

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] assorted delta code cleanup
Nicolas Pitre [Wed, 29 Jun 2005 06:49:56 +0000 (02:49 -0400)]
[PATCH] assorted delta code cleanup

This is a wrap-up patch including all the cleanups I've done to the
delta code and its usage.  The most important change is the
factorization of the delta header handling code.

Signed-off-by: Nicolas Pitre <>
Signed-off-by: Linus Torvalds <>
15 years agoFix packed_delta_info() that was broken by the delta header packing change
Linus Torvalds [Wed, 29 Jun 2005 05:42:45 +0000 (22:42 -0700)]
Fix packed_delta_info() that was broken by the delta header packing change

Pointed out by Junio.

15 years agoMake git pack files use little-endian size encoding
Linus Torvalds [Wed, 29 Jun 2005 05:15:57 +0000 (22:15 -0700)]
Make git pack files use little-endian size encoding

This makes it match the new delta encoding, and admittedly makes the
code easier to follow.

This also updates the PACK file version to 2, since this (and the delta
encoding change in the previous commit) are incompatible with the old

15 years ago[PATCH] denser delta header encoding
Nicolas Pitre [Wed, 29 Jun 2005 04:27:45 +0000 (00:27 -0400)]
[PATCH] denser delta header encoding

Since the delta data format is not tied to any actual git object
anymore, now is the time to add a small improvement to the delta data
header as it is been done for packed object header.  This patch allows
for reducing the delta header of about 2 bytes and makes for simpler

Signed-off-by: Nicolas Pitre <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Emit base objects of a delta chain when the delta is output.
Junio C Hamano [Wed, 29 Jun 2005 00:49:27 +0000 (17:49 -0700)]
[PATCH] Emit base objects of a delta chain when the delta is output.

Deltas are useless by themselves and when you use them you need to get
to their base objects.  A base object should inherit recency from the
most recent deltified object that is based on it and that is what this
patch teaches git-pack-objects.

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years agogit-unpack-objects: re-write to read from stdin
Linus Torvalds [Wed, 29 Jun 2005 03:34:23 +0000 (20:34 -0700)]
git-unpack-objects: re-write to read from stdin

It gets a bit more complicated to unpack in a streaming environment, but
here it is.  The rewrite is actually a lot cleaner in other ways, it's
just a bit more subtle.

15 years ago[PATCH] Use enhanced diff_delta() in the similarity estimator.
Junio C Hamano [Tue, 28 Jun 2005 23:58:27 +0000 (16:58 -0700)]
[PATCH] Use enhanced diff_delta() in the similarity estimator.

The diff_delta() interface was extended to reject generating too big a
delta while we were working on the packed GIT archive format.

Take advantage of that when generating delta in the similarity estimator
used in diffcore-rename.c

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fix unpack-objects for header length information.
Junio C Hamano [Tue, 28 Jun 2005 23:49:28 +0000 (16:49 -0700)]
[PATCH] Fix unpack-objects for header length information.

Standalone unpack-objects command was not adjusted for header length
encoding change when dealing with deltified entry.  This fixes it.

Signed-off-by: Junio C Hamano <>
Signed-off-by: Linus Torvalds <>