summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-07-14Fix replacing of a directory with a file/symlink in git-checkout-cacheLinus Torvalds
The symlink case had never worked, and the file case was broken by the O_EXCL change because the error return changed from EISDIR to EEXIST. Fix both problems by just moving the test for an existing directory to a more logical place.
2005-07-14Make "git diff" use git-sh-setup-script too..Linus Torvalds
Give a sane error rather than just silently claiming no diffs when you're not at the top-level directory.
2005-07-14Make "git prune" use the "--full" flag to git-fsck-cacheLinus Torvalds
It's too dangerous not to. We need to follow alternate object directories etc, or we might say something is unreachable just because we didn't look it up completely.
2005-07-14[PATCH] Documentation: push-pull commands into a separate category.Junio C Hamano
This splits push-pull related commands into a separate category. I think a bigger overhaul of the main index is needed, but have not got around to it. Help is welcome. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] Documentation: send/receive.Junio C Hamano
This adds documentation for 'smarter push' family of commands. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] Documentation: clone/fetch/upload.Junio C Hamano
This adds documentation for 'smarter pull' family of commands. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] Documentation: packed GIT support commands.Junio C Hamano
This adds documentation for creating packed archives, inspecting, validating them, and unpacking them. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14Get rid of nasty utf-8 characters in printoutLinus Torvalds
Oh, well.. FC4 has UTF-8 as the default environment, and I applaud that, but then it sometimes results in these characters that aren't actually visible as a problem.
2005-07-14[PATCH] apply: match documentation, usage string and code.Junio C Hamano
The more recent --apply option was not described. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] Remove leftover comment from documentation.Junio C Hamano
The comment was left over from the days when we had a single huge core-git.txt document. No more. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] clone-pack: Typofix in the error message.Junio C Hamano
Cleans a small cut-and-paste mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] clone-pack and clone-script: documentation and add a missing parameter.Junio C Hamano
While adding the documentation for these two commands, I noticed that the name of the program on the other end (git-upload-pack) is already almost configurable but git-clone-pack lacked command line parameter parsing to actually use anything but default, so I introduced --exec= like other remote commands while I was at it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] checkout-cache: add usage string.Junio C Hamano
This adds the usage string to checkout-cache and you can say "--help" to get it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] cat-file: be consistent in usage string and documentation.Junio C Hamano
Now that we have something called tag object, and a notion of "tags" stored in .git/refs/tags/ directory, the word "tagname" has become misleading in the usage string. The documentation already calls that <type>. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14[PATCH] Document two pack push-pull protocols.Junio C Hamano
This documents the two pack push-pull protocols used by the smart upload-fetch/clone and send/receive commands. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-14Fix the "close before dup" bug in clone-pack tooLinus Torvalds
Same issue as git-fetch-pack.
2005-07-14Add a "git-daemon" that listens on a TCP portLinus Torvalds
.. and does a "git-upload-pack" on demand.
2005-07-14git-fetch-pack: close output fd after dup'ing the inputLinus Torvalds
With the socket case, the input and output fd's might end up being the same, so we want to dup the other before we close either of them.
2005-07-14Add first cut at "git protocol" connect logic.Linus Torvalds
Useful for pulling stuff off a dedicated server. Instead of connecting with ssh or just starting a local pipeline, we connect over TCP to the other side and try to see if there's a git server listening. Of course, since I haven't written the git server yet, that will never happen. But the server really just needs to listen on a port, and execute a "git-upload-pack" when somebody connects. (It should read one packet-line, which should be of the format "git-upload-pack directoryname\n" and eventually we migth have other commands the server might accept).
2005-07-14Make "git-checkout" create files with O_EXCLLinus Torvalds
We should always have unlinked any old ones before, but this just makes sure that we never over-write any old file. A quick "grep" now shows that all the core tools that open files for writing use O_EXCL, ie we never overwrite an existing file in place.
2005-07-14git-apply: be a lot more careful when writing filesLinus Torvalds
We write them under another name and rename them to their destination, so that if something bad happens in the middle, we won't have caused any bigger harm. Also, this makes the writing be NFS "intr" safe, and as a side effects makes sure that if the target is hardlinked (or symlinked) we will have broken the link.
2005-07-13[PATCH] Clean up diff option descriptions.Junio C Hamano
I got tired of maintaining almost duplicated descriptions in diff-* brothers, both in usage string and documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-13[PATCH] git-diff-*: --name-only and --name-only-z.Junio C Hamano
Porcelain layers often want to find only names of changed files, and even with diff-raw output format they end up having to pick out only the filename. Support --name-only (and --name-only-z for xargs -0 and cpio -0 users that want to treat filenames with embedded newlines sanely) flag to help them. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-13[PATCH] diff-stages: support "-u" as a synonym for "-p".Junio C Hamano
Just to be consistent, support "-u" as a synonym for "-p" like everybody else does. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-12[PATCH] git-cvsimport-script: parse multidigit revisions.Sven Verdoolaege
Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-12[PATCH] git: fix trivial warning from show_rename_copy()Tony Luck
apply.c: In function `show_rename_copy': apply.c:1147: warning: field precision is not type int (arg 3) Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-12Abstract out the "name <email> date" handling of commit-tree.cLinus Torvalds
We'll want to use it for the tagging too.
2005-07-12parse_date(): allow const date stringLinus Torvalds
This is part of breaking up the tag ID patch by Eric Biederman.
2005-07-12"make clean" should clean up after a rpm buildLinus Torvalds
There's a few generated files that we left behind.
2005-07-12Rename the RPM from "git" to "git-core"Linus Torvalds
That way we avoid any confusion with "GNU Interactive Tools", and it's more descriptive anyway (the rpm documentation talks about how git is split into a "core" part and an "SCM" part, this makes it clear that this is the core one).
2005-07-12Add "git branch" scriptLinus Torvalds
You can use it as git branch <branchname> [start-point] and it creates a new branch of name <branchname>. If a starting point is specified, that will be where the branch is created, otherwise it will be created at the current HEAD. The sequence git branch xyz abc git checkout xyz can also be written as git checkout -b xyz abc as per the previous commit.
2005-07-12Make "git checkout" create new branches on demandLinus Torvalds
In particular, if we check out something that isn't an old branch, it now requires a new branch-name to check the thing out into. So, for example: git checkout -b my-branch v2.6.12 will create the new branch "my-branch", and start it at v2.6.12, while git checkout master will just switch back to the master branch. Of course, if you want to create a new branch "my-branch" and _not_ check it out, you could have done so with just git-rev-parse v2.6.12^0 > .git/refs/heads/my-branch which I think I will codify as "git branch".
2005-07-12Make "git checkout" verify that the argument refers to a commitLinus Torvalds
We still need to create a new branch if it didn't refer to an existing branch, otherwise our HEAD will continue to point to something totally different than what we just checked out. I'll need to think about it. Maybe only do it with "-f" and force it to the "master" branch?
2005-07-12git-rev-parse: Allow a "zeroth" parent of a commit - the commit itself.Linus Torvalds
This sounds nonsensical, but it's useful to make sure that the result is a commit. For example, "git-rev-parse v2.6.12" will return the _tag_ object for v2.6.12, but "git-rev-parse v2.6.12^0" will return the _commit_ object associated with that tag (and v2.6.12^1 will return the first parent). Also, since the "parent" code will actually parse the commit, this, together with the "--verify" flag, will verify not only that the result is a single SHA1, but will also have verified that it's a proper commit that we can see.
2005-07-12git-send-pack: Fix duplicate refname matchLinus Torvalds
Cut-and-paste dup noticed by Junio. It's not even harmless, since a match also causes that match to be invalidated, so this made it impossible to update an existing branch by name. I'd only tested the case of "ref doesn't exist at all on the other end", which worked fine.
2005-07-11[PATCH] Bootstrap "make dist"Chris Wright
Use git-tar-tree directly from git source during make dist. This handles bootstrap issue with git not being installed. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] git-clone-script local optimization tweaksJunio C Hamano
- When local optimization is used, the variable repo has already been passed through get_repo_base so there is no need to check for .git subdirectory in there. - Use cpio -l instead of "cp -l". Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] git-cvsimport-script: add "import only" optionSven Verdoolaege
git-cvsimport-script: add "import only" option which tells the script not to perform a checkout after importing. This ensures that the working directory and cache remain untouched and will not create them if they do not exist. Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] add --missing-ok option to write-treeBryan Larsen
This option allows a write-tree even if the referenced objects are not in the database. Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] Check packs and then files.Junio C Hamano
This reverses the order of object lookup, to check pack index first and then go to the filesystem to find .git/objects/??/ hierarchy. When most of the objects are packed, this saves quite many stat() calls and negative dcache entries; while the price this approach has to pay is negligible, even when most of the objects are outside pack, because checking pack index file is quite cheap. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] Dereference tag repeatedly until we get a non-tag.Junio C Hamano
When we allow a tag object in place of a commit object, we only dereferenced the given tag once, which causes a tag that points at a tag that points at a commit to be rejected. Instead, dereference tag repeatedly until we get a non-tag. This patch makes change to two functions: - commit.c::lookup_commit_reference() is used by merge-base, rev-tree and rev-parse to convert user supplied SHA1 to that of a commit. - rev-list uses its own get_commit_reference() to do the same. Dereferencing tags this way helps both of these uses. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-10[PATCH] alternate object store and fsckv0.99Junio C Hamano
The location alt_odb[j].name[0..] is filled with ??/?{38} to form a sha1 filename to try, but I was too lazy to allocate a copy, so while fsck_object_dir() is running for the directory, the filenames ??/?{38} are filled after NUL (usually and always the location should have '/'), making them "not found". This should fix it. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-10Fix up progress report for off-by-one errorLinus Torvalds
We used to print the index of the object we unpacked, not how many we had unpacked. Which caused slightly confusing progress reports like 100% (2/3) done rather than the more obvious "3/3" for 100% ;)
2005-07-10Make "git log" exit properly if not in a git archiveLinus Torvalds
Instead of getting an incomprehensible error message from git-rev-list.
2005-07-10Avoid signedness warnings in sha1_file.cLinus Torvalds
Very irritating. But "snprintf()" wants "char *", and zlib wants "unsigned char *".
2005-07-10[PATCH] Remove map_sha1_fileDaniel Barkalow
Remove map_sha1_file(), now unused. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-10[PATCH] write_sha1_to_fd()Daniel Barkalow
Add write_sha1_to_fd(), which writes an object to a file descriptor. This includes support for unpacking it and recompressing it. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-10git-rev-list: allow missing objects when the parent is marked UNINTERESTINGLinus Torvalds
We still want the "top-most" uninteresting object to exist, so that we know that we have reached it.
2005-07-09Add "-q" flag to "git commit"Linus Torvalds
Maybe you don't want the progress report.
2005-07-09git-unpack-objects: show progress report by defaultLinus Torvalds
This ends up being very calming for big "git clone"s, since otherwise you just get very frustrated with a long silence, wondering whether it's working at all. Use "-q" to quiet it down. Now if we could just do the same for the initial "figure out what to pack" phase, which can also be quite slow if the other end is busy (or not packed and not in cache)...