Linus Torvalds
2f34ba32dd
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.
2005-07-05 15:45:00 -07:00
Linus Torvalds
41cb7488b9
Move "get_ack()" to common git_connect functions
...
git-clone-pack will want it too. Soon.
2005-07-05 15:44:09 -07:00
Linus Torvalds
4f7770c87c
Remove multi-head support from fetch-pack
...
It was a misguided attempt to mix fetching and cloning. I'll make
a separate clone thing.
2005-07-05 14:39:30 -07:00
Linus Torvalds
12ba7eaf1d
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.
2005-07-05 12:12:50 -07:00
Linus Torvalds
bbca20acce
Merge head 'cvs2git' of http://netz.smurf.noris.de/git/git
2005-07-05 12:03:14 -07:00
Linus Torvalds
f03f2ba0a5
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.
2005-07-05 12:02:10 -07:00
Linus Torvalds
0a623e7ce8
git-fetch-script: use git-fetch-pack for local and ssh fetches.
...
Also, clean it up a lot.
2005-07-05 11:38:37 -07:00
Linus Torvalds
723c31fea2
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.
2005-07-05 11:31:32 -07:00
Matthias Urlichs
f4b3a4c30b
Merge with Linus' current tree
2005-07-05 15:32:29 +02:00
Matthias Urlichs
f13bbe7f56
Merge with http://www.liacs.nl/~sverdool/git.git#cvs2git
2005-07-05 14:23:36 +02:00
Matthias Urlichs
a9174a14fc
cvsimport: getopt accepted a -q option (undocumented and unused).
...
Removed.
2005-07-05 14:22:53 +02:00
Sven Verdoolaege
210569f9ae
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.
2005-07-05 13:19:59 +02:00
Linus Torvalds
7a662e896b
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.
2005-07-04 16:49:37 -07:00
Linus Torvalds
7620d39fcb
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.
2005-07-04 16:36:48 -07:00
Linus Torvalds
75bfc6c232
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
whatever.
2005-07-04 16:35:13 -07:00
Linus Torvalds
fb9040cc83
Make git-fetch-pack and git-upload-pack negotiate needs/haves fully
...
Now the only piece missing is actually generating the pack-file.
2005-07-04 15:29:17 -07:00
Linus Torvalds
6cada6a98d
Clean up output of "for_each_ref()" when GIT_DIR is "."
...
Remove the "./" at the head, it just looks much nicer.
2005-07-04 15:28:19 -07:00
Sven Verdoolaege
fc6e714c83
git-cvsimport-script: remove unused variable
2005-07-04 23:18:35 +02:00
Linus Torvalds
def88e9afb
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.
2005-07-04 13:26:53 -07:00
Linus Torvalds
013e7c7ff4
Move ref path matching to connect.c library
...
It's a generic thing for matching refs from the other side.
2005-07-04 13:24:30 -07:00
Linus Torvalds
f71925983d
Factor out the ssh connection stuff from send-pack.c
...
I want to use it for git-fetch-pack too.
2005-07-04 11:57:58 -07:00
Sven Verdoolaege
1750113206
git-cvsimport-script: more error handling
2005-07-04 17:36:25 +02:00
Jon Seymour
a61eea6abd
[PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff8
...
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 <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-04 08:22:32 -07:00
Sven Verdoolaege
28537171e7
git-cvsimport-script: provide direct support for cvsps -z option
2005-07-04 17:10:06 +02:00
Sven Verdoolaege
6e7e37b0bf
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.
2005-07-04 15:35:30 +02:00
Sven Verdoolaege
46e63efc07
git-cvsimport-script: fix branch switching
...
Previous patch broke branch switching.
2005-07-04 15:28:36 +02:00
Sven Verdoolaege
79ee456cf2
git-cvsimport-script: use private index.
2005-07-04 13:36:59 +02:00
Linus Torvalds
671fe4bb20
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.
2005-07-03 21:01:11 -07:00
Linus Torvalds
5736bef18c
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.
2005-07-03 20:27:06 -07:00
Sven Verdoolaege
2eb6d82eaa
git-cvsimport-script: leave working directory alone.
2005-07-04 00:43:26 +02:00
Linus Torvalds
5f3de58ff8
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.
2005-07-03 15:34:04 -07:00
Sven Verdoolaege
866d13108e
git-cvsimport-script: typo head -> heads
2005-07-03 23:40:48 +02:00
Linus Torvalds
2396ec85bd
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.
2005-07-03 14:27:34 -07:00
Linus Torvalds
b2d46199d2
Add "git repack" command that does an incremental pack
2005-07-03 13:38:01 -07:00
Linus Torvalds
1c4a291202
Add "--non-empty" flag to git-pack-objects
...
It skips writing the pack-file if it ends up being empty.
2005-07-03 13:36:58 -07:00
Linus Torvalds
12d2a18780
"git rev-list --unpacked" shows only unpacked commits
...
More infrastructure to do efficient incremental packs.
2005-07-03 13:29:54 -07:00
Linus Torvalds
eb019375ab
Add "--incremental" flag to git-pack-objects
...
It won't add an object that is already in a pack to the new pack.
2005-07-03 13:08:40 -07:00
Linus Torvalds
960bba0d8c
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.
2005-07-03 13:07:52 -07:00
Linus Torvalds
dade09c226
Add "has_sha1_pack()" function to query whether the object is available in a pack
...
We'll want this for incremental packing.
2005-07-03 13:06:36 -07:00
Linus Torvalds
c33303839c
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.
2005-07-03 10:40:38 -07:00
Linus Torvalds
6da4016aea
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.
2005-07-03 10:10:45 -07:00
Matthias Urlichs
9da07f3493
cvsimport: Missing tests for verbosity flag.
2005-07-03 19:03:30 +02:00
Linus Torvalds
44c9e8594e
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.
2005-07-03 10:02:35 -07:00
Linus Torvalds
944d858969
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.
2005-07-03 10:01:38 -07:00
Linus Torvalds
7ec4e60819
Fix gcc warning in send-pack.c
...
send_pack() was declared to return "int" (although nobody cared), but
didn't actually return anything.
2005-07-03 10:00:01 -07:00
Linus Torvalds
4d235c8044
Avoid gcc warnings in sha1_file.c
...
A couple of bogus "might be used undefined" warnings are avoided
by moving the initializations unnecessarily early.
2005-07-03 09:58:44 -07:00
Sven Verdoolaege
34155390a5
Support :ext: access method.
2005-07-03 13:02:06 +02:00
Sven Verdoolaege
8d0ea31175
Honour CVS_SERVER.
2005-07-03 12:26:51 +02:00
Sven Verdoolaege
a92bebe697
git-cvsimport-script: clean up documentation
...
Remove documentation of irrelevant "type" option.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-07-03 11:40:45 +02:00
Sven Verdoolaege
f9714a4a0c
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 <skimo@kotnet.org>
2005-07-03 11:40:44 +02:00