summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-07-15[PATCH] Use gzip -f when building the git-core tarballEric W. Biederman
This allows rebuilding the tarball when it is already present without having to answer annoying questions from gzip Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Add a RPMBUILD make variableEric W. Biederman
This allows RPMBUILD to be overridden for people with old versions of rpm or people who want to pass rpmbuild extra options. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Update tags to record who made themEric W. Biederman
And finally what all of this has been leading up to. The 2 line code change to record who made a tag, and the 8 line code change to check that we recorded the tag. Gosh the error checking is always so much bigger than the code :) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Update git-tag-script to create the .git/refs/tags if it does not ↵Eric W. Biederman
already exist When testing tags I ran into an interesting problem. git-tag-script dies if .git/refs/tags/ does not exist. And that directory didn't get created when I build my repository, so we need to create it if it doesn't exist. Signed-of-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Update the list of diagnostics for git-commit-treeEric W. Biederman
With the recent work on setup_ident() there are a few more possible diagnostic messages form git-commit-tree Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Add git-var a tool for reading interesting git variables.Eric W. Biederman
Sharing code between shell scripts and C is a challenge. The program git-var allows us to have a set of named values that a shell script can interrogate and a normal C program can simply call the functions that compute them. Allowing sharing when computing plain test values. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] ident.c: Disambiguate the error messages in setup_identEric W. Biederman
If your user name is too long it is your sysadmin who hates you not your parents! Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> [ Fixed grammar ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15[PATCH] Move git_author_info and git_commiter_info to ident.cEric W. Biederman
Moving these functions allows all of the logic for figuring out what these values are to be shared between programs. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15Add "--inetd" flag to git-daemonLinus Torvalds
All credit go to Alexey Nezhdanov <snake@penza-gsm.ru>, I just ended up re-implementing his idea.
2005-07-15git-daemon: re-organize code a bit for --inetd flagLinus Torvalds
Alexey Nezhdanov sent a patch that made git-daemon usable from inetd (ie where inetd has already done the accept on the new connection, the fork, and the setup of stdin/stdout). I wanted to organize the thing slightly differently, though.
2005-07-15Split up "diff_format" into "format" and "line_termination".Linus Torvalds
This removes the separate "formats" for name and name-with-zero- termination. It also removes the difference between HUMAN and MACHINE formats, and they both become DIFF_FORMAT_RAW, with the difference being just in the line and inter-filename termination. It also makes the code easier to understand.
2005-07-14Make "ce_match_path()" a generic helper functionLinus Torvalds
... and make git-diff-files use it too. This all _should_ make the diffcore-pathspec.c phase unnecessary, since the diff'ers now all do the path matching early interally.
2005-07-14Make git-diff-cache skip any comparisons which don't match pathspecLinus Torvalds
This brings all the same pathspec optimizations that git-diff-tree does to git-diff-cache.
2005-07-14Start using the partial tree reading in "git-diff-cache"Linus Torvalds
The reason I say "start using" is that we really should also limit the index checking by name - now we limit the tree object accesses by name, but we still check the whole index. Still, this should help.
2005-07-14Fix up read_tree() pathspec matching to use "const char **"Linus Torvalds
The same way the other pathspecs work. Also fix missing success return from the matching - not that anything actually uses this yet ;)
2005-07-14Start adding interfaces to read in partial treesLinus Torvalds
The same way "git-diff-tree" can limit its output to just a set of matches, we can read in just a partial tree for comparison purposes.
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.