summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-07-03Make git-fsck-cache check HEAD integrityLinus Torvalds
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-03Fix sparse warnings.Linus Torvalds
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-03cvsimport: Missing tests for verbosity flag.Matthias Urlichs
2005-07-03Fix up header file dependencies and add sparse checking rulesLinus Torvalds
We're pretty sparse-clean already, thanks to earlier efforts, but some things inevitably creep in.
2005-07-03Fix up "for_each_ref()" to be more usable, and use it in git-fsck-cacheLinus Torvalds
It needed to take the GIT_DIR information into account, something that the original receive-pack usage just never cared about.
2005-07-03Fix gcc warning in send-pack.cLinus Torvalds
send_pack() was declared to return "int" (although nobody cared), but didn't actually return anything.
2005-07-03Avoid gcc warnings in sha1_file.cLinus Torvalds
A couple of bogus "might be used undefined" warnings are avoided by moving the initializations unnecessarily early.
2005-07-03Support :ext: access method.Sven Verdoolaege
2005-07-03Honour CVS_SERVER.Sven Verdoolaege
2005-07-03git-cvsimport-script: clean up documentationSven Verdoolaege
Remove documentation of irrelevant "type" option. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-07-03Make specification of CVS module to convert optional.Sven Verdoolaege
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-03Fixed a typo in Documentation/git-cvsimport-script.txt.Sven Verdoolaege
2005-07-03Generalize the "show each ref" code in receice-packLinus Torvalds
This turns it into a generic "do xyz for each ref" library function.
2005-07-01[PATCH] Show more details of packfile with verify-pack -v.Junio C Hamano
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-01[PATCH] verify-pack updates.Junio C Hamano
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-01[PATCH] Avoid unnecessarily inflating and interpreting deltaJunio C Hamano
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30cvsimport: add documentation.Matthias Urlichs
2005-06-30cvsimport: Added option '-p': pass options to cvspsMatthias Urlichs
Added option '-x' to cvsps call
2005-06-30cvsimport: Exit if an existing repository doesn't have the right branch.Matthias Urlichs
2005-06-30cvs import: Strip whitespace at the end of the log entryMatthias Urlichs
for compatibility with old cvs2git.
2005-06-30Do ref matching on the sender side rather than on receiverLinus Torvalds
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".
2005-06-30Add support for "forcing" a ref on the remote sideLinus Torvalds
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.
2005-06-30git-send-pack: actually send the object packLinus Torvalds
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.
2005-06-30git-receive-pack: implement ref switch command handlingLinus Torvalds
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.
2005-06-30cvsimport: perform string comparison on "HEAD"Sven Verdoolaege
2005-06-30git-cvsimport-script: Removed redundant @old and @new clear.Matthias Urlichs
2005-06-30git-cvsimport-script: Remove setting Sticky; it may cause problemsMatthias Urlichs
2005-06-30cvs import: Call git-update-cache multiple timesMatthias Urlichs
instead of with a too-long argument list.
2005-06-30Add comment on what send-pack still needs to doLinus Torvalds
Me tired.
2005-06-30git-receive-pack: start parsing ref update commandsLinus Torvalds
We don't act on them yet, but we parse them.
2005-06-30Slow but steady progress on git pack receive/sendLinus Torvalds
2005-06-30git-send-pack: start parsing local/remote reference differencesLinus Torvalds
Right now it just shows which refs it picks up, and whether they are the same or changed on the remote end. Getting there..
2005-06-30Turn on optimization againLinus Torvalds
It got turned off by mistake just because I had been doing debugging, and committed the Makefile that had other changes ...
2005-06-30[PATCH] Remove unnecessary sort from t6001 testcaseJon Seymour
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 <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30[PATCH] Fix broken t6001 test caseJon Seymour
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 <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30[PATCH] Demonstrate broken t6001 test case functionJon Seymour
Junio discovered a problem where an actual test case break was hidden because pipelines are not handled properly by the test infrastructure in t6001. This patch fixes the broken infrastructure (and demonstrates the break explicitly). A subsequent patch in this series will fix the test case so that it doesn't fail. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30[PATCH] Fix for git-rev-list --merge-order B ^A (A,B share common base) [rev 2]Jon Seymour
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: A | B |/ C | D 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 <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30[PATCH] Test case that demonstrates problem with --merge-order ^ processingJon Seymour
Added a test case that shows that --merge-order doesn't produce the correct result in the following case. A | | B |/ C | D 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 <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30Make send/receive-pack be closer to doing something interestingLinus Torvalds
2005-06-30Start of "git-send-pack", the local part of sending off a packLinus Torvalds
Like git-receive-pack, this is only partway done.
2005-06-30Add first cut at "git-receive-pack"Linus Torvalds
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.
2005-06-29Remove bogus dup commit warning with --merge-orderLinus Torvalds
It makes gitk unhappy, and besides, non-merge-order doesn't complain, so why do it here..
2005-06-29Teach git-rev-list about non-commit objectsLinus Torvalds
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 commits.
2005-06-29Prepare git-rev-list for tracking tag objects tooLinus Torvalds
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.
2005-06-29[PATCH] Adjust t5300 test for unpack-objects changeJunio C Hamano
It now always read from standard input and rejects non-flag arguments. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-29Re-instate dry-run logic in git-unpack-objectsLinus Torvalds
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.
2005-06-29Clean up git-unpack-objects a bitLinus Torvalds
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.
2005-06-29[PATCH] Add git-verify-pack command.Junio C Hamano
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-29[PATCH] Fixlets on top of Nico's clean-up.Junio C Hamano
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-29[PATCH] assorted delta code cleanupNicolas Pitre
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 <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>