summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge three separate "fetch refs" functionsLinus Torvalds2005-07-165-109/+67
| | | | | It really just boils down to one "get_remote_heads()" function, and a common "struct ref" structure definition.
* git-send-pack: add "--all" option to send all refs to the other sideLinus Torvalds2005-07-161-10/+28
| | | | | This affects only refs that the other side doesn't already have. The ones it has are still filtered by the ref selection.
* git-fetch-script: fix http:// breakageLinus Torvalds2005-07-161-1/+1
| | | | | | | | We were trying to fetch using the merge-head name rather than the merge-head SHA1 that we just got. Now, http:// is broken anyway right now for packing, but this should make it work for nonpacked repositories again.
* Fix git-fetch-script breakageLinus Torvalds2005-07-161-0/+2
| | | | It had the test for the destination reversed.
* Merge git-tools repository under "tools" subdirectoryLinus Torvalds2005-07-165-0/+527
|\ | | | | | | | | | | | | Thanks to Ryan Anderson for setting me up to do this. I'd have used his work, but I wanted to clean up the old git-tools repository before merging it: it had old-style file modes etc that needed a round of git-convert-cache to fix up.
| * Prepare git-tools for merging into the main git archiveLinus Torvalds2005-07-167-358/+5
| | | | | | | | | | | | | | | | | | | | | | Rename into a "tools" subdirectory, and change name of "dotest" to "applymbox". Remove stripspace (which was already copied into git) and cvs2git (which was likewise already copied into git, and then replaced by a much better perl version). All of this was brought on by Ryan Anderson shaming me into it. Thanks. I guess.
| * Add "Index: " to the list of things that start a patchLinus Torvalds2005-06-231-1/+2
| | | | | | | | | | | | This way we don't get it in the commit message, even if the patch had been generated by cogito (or CVS, ugh) and people didn't add the proper "---" marker.
| * Avoid doing the "filelist" thing, since "git-apply" picks up the files ↵Linus Torvalds2005-06-233-62/+11
| | | | | | | | | | | | | | | | | | | | | | | | automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
| * applypatch: use "--index" to actually make git-apply write theLinus Torvalds2005-06-051-1/+1
| | | | | | | | changes to the index file.
| * applypatch: use the new git-apply to apply patchesLinus Torvalds2005-06-051-4/+1
| | | | | | | | | | | | Let's test it with some real-world horror schenarios. I'm crazy, I know.
| * cvs2git: use CVS (rather than RCS) to extract the differentLinus Torvalds2005-05-301-27/+37
| | | | | | | | | | | | | | | | | | file versions. This allows you to do the conversion (although slowly) from a remote repository, and besides, it's one less thing to worry about when you don't need to look up the CVS Attic directories etc.
| * cvs2git: fix character quotingLinus Torvalds2005-05-241-0/+4
| | | | | | | | | | | | | | | | We need to quote backslash and backtick too. And inform the user about our progress, since converting a big archive can take time. Doing the full mutt history took just under eight minutes.
| * cvs2git: set timezone info to UTC, the way CVS doesLinus Torvalds2005-05-241-2/+2
| | | | | | | | | | | | | | This should also mean that the conversion is now completely defined by the CVS tree, and that two people doing a cvs2git conversion on the same base will always get the same results regardless of when or in what timezone they do it.
| * cvs2git: add support for GIT_COMMITTER_DATELinus Torvalds2005-05-241-1/+1
| | | | | | | | Of course, this requires a version of git that cares..
| * cvs2git: escape <<EOF messages, and work around cvsps branch handlingLinus Torvalds2005-05-241-1/+33
| | | | | | | | | | | | This escapes '$' characters in <<-handling, and gives preference to the new branch when cvsps incorrectly reports a commit as originating on an old branch.
| * Fix cvs2git branch handlingLinus Torvalds2005-05-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | .. and tell 'co' to shut up about the rcs noise. This still leaves some branch issues up in the air: it looks like cvsps has some questionable originating branch information, but I don't know whether that's a cvsps bug or an actual bug in the syslinux archive I'm using to test. I'll let David Mansfield answer my questions about CVS. I'm a total idiot when it comes to branches under CVS ("I'm pure!").
| * Add "cvs2git" program to convert a CVS archive into a GIT archiveLinus Torvalds2005-05-242-1/+256
| | | | | | | | | | | | | | | | | | | | It's very hacky, and it needs lots of work, but it seems to have converted Peter's "syslinux" archive successfully. Whether the end result is correct or not is to be seen. Tons of work still to do: do name conversion properly, and do tags etc. And testing. Lots of testing.
| * Make "applypatch" use the "-E" flag to patch.Linus Torvalds2005-05-171-1/+1
| | | | | | | | | | Always remove empty files, regardless of how the diff showed them to have become empty.
| * Update applypatch to use new GIT_-prefix environment variables.Linus Torvalds2005-05-171-3/+3
| | | | | | | | Avoid the warnings from newer git versions.
| * Get AUTHOR_DATE from the email Date: lineLinus Torvalds2005-05-012-2/+15
| | | | | | | | | | | | | | Now that git does pretty reliable date parsing, we might as well get the date from the email itself. Of course, it's still questionable whether the date on the email is all that relevant, but it's certainly no worse than taking the commit date.
| * Add "stripspace" program to clean up email commentaryLinus Torvalds2005-04-304-3/+52
| | | | | | | | Remove multiple empty lines, and empty lines at beginning and end.
| * Fix up "applypatch" for the big git renameLinus Torvalds2005-04-291-6/+5
| | | | | | | | Add "git-" prefixes to git commands.
| * [PATCH] make dotest more amenable to commit message editingJames Bottomley2005-04-202-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.
| * Add quotes around the subject line that we print out as being applied.Linus Torvalds2005-04-181-1/+1
| | | | | | | | | | | | My brain just flipped when it tried to read the "Applying" as part of the explanation of the patch, and the sentence didn't make any sense. The quotes make it clear what's going on.
| * Add "dotest" and "applypatch" scripts to actually make things useful.Linus Torvalds2005-04-180-0/+0
| | | | | | | | Also updates "mailinfo" to write the file list.
| * Add "applypatch" and "dotest" scripts to tie it all together.Linus Torvalds2005-04-124-5/+63
| | | | | | | | This should be getting it all pretty close to a working setup.
| * Start of early patch applicator tools for git.Linus Torvalds2005-04-113-0/+458
| | | | | | | | | I looked a bit at my old BK tools for the same thing, but they were just so horrid in many ways that I largely rewrote it all and these tools do things a bit differently. Instead of aggressively piping data from one process to another (which was clever but very hard to follow), this first just splits out the mbox into many smaller email files, and then does some scripts on these temporary files.
* git-convert-cache: fix up file modes in trees tooLinus Torvalds2005-07-161-0/+29
| | | | | | | | git-fsck-cache complains about some of the odder ones, and is quiet about the old (S_IFREG | 664) case, but that's wrong too. Converting the kernel tree is too painful right now, but at least we know how to do it if we ever want to.
* [PATCH] Documentation: describe short-hand used in fetch/pull.Junio C Hamano2005-07-165-6/+130
| | | | | | | Describe short-hand for remote repository used in fetch/pull. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fetch/pull: short-hand notation for remote repositories.Junio C Hamano2005-07-164-32/+104
| | | | | | | | | | | | | | | | Since pull and fetch are done often against the same remote repository repeatedly, keeping the URL to pull from along with the name of the head to use in $GIT_DIR/branches/$name makes a lot of sense. Adopt that convention from Cogito, and try to be compatible when possible; storing a partial URL and completing it with a trailing path may not be understood by Cogito. While we are at it, fix pulling a tag. Earlier, we updated only refs/tags/$tag without updating FETCH_HEAD, and called resolve-script using a stale (or absent) FETCH_HEAD. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Be slightly smarter about git-daemon client shutdownLinus Torvalds2005-07-151-20/+38
| | | | | | Shut down connections that haven't even identified themselves as git clients first. That should get rid of people who just connect to the port and wait for something to happen.
* [PATCH] Documentation: update recommended workflow when working with others.Junio C Hamano2005-07-151-19/+42
| | | | | | | | | | | | | Clarify that the hierarchy implied by the recommended workflow is only informal. Refer readers to nice illustration by Randy Dunlap. Separate out the step to "push" to own public repository in the workflow. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Documentation: adjust cvsimport command line.Junio C Hamano2005-07-151-1/+1
| | | | | | | | | The cvsimport example in the cvs migration document was still using the old syntax for target repository after new and improved cvsimport-script was merged. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* git-daemon: actually remember the children we have outstandingLinus Torvalds2005-07-151-21/+121
| | | | | | | | This is using a lockless approach that allows us to handle children dying without having to block SIGCHLD. Right now our "solution" to too many kids is pretty damn rough, but it at least shows what you can do.
* git-daemon: keep track of childrenLinus Torvalds2005-07-151-1/+43
| | | | | We don't want them as zombies, and eventually we'll want to limit their number. Right now we just count them.
* Ahh, the heady days of 0.99 patchfilesv0.99.1Linus Torvalds2005-07-151-2/+2
| | | | | | | | | | | | | | | Now, not all projects can be as refined as Linux. Before the final 1.0 release, we went through fifteen 0.99 patchfiles, and pl14 alone went through subreleases 'a' through 'z'. Now _that_ is a release process. Not to mention the odd-ball releases, like 0.96c+ Sadly, in this day and age of RPM's etc, we have silly limitations, and I cannot call this release '0.99pl5a or some such awe-inspiring name just because "rpmbuild" is such a party pooper. So it's just 0.99.1. Oh well. Aspiring to such greatness as the Linux release numbering is hubris anyway. You can attain such perfection only once in your life.
* Fix up "make doc"Linus Torvalds2005-07-152-2/+2
| | | | | Fix 'git-var.txt' and use "-b xhtml11" instead of "-b css-embedded" to make asciidoc 7.0.1 happy.
* [PATCH] Documentation: pull, push, packing repository and working with others.Junio C Hamano2005-07-151-74/+283
| | | | | | | | | | | | | | | | Describe where you can pull from with a bit more detail. Clarify description of pushing. Add a section on packing repositories. Add a section on recommended workflow for the project lead, subsystem maintainers and individual developers. Move "Tag" section around to make the flow of example simpler to follow. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Documentation: update tutorial to talk about push.Junio C Hamano2005-07-151-7/+80
| | | | | | | | Talk about publishing to a public repository. Also fixes a couple of typos. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Initial support for building a debian package (.deb)Eric W. Biederman2005-07-156-0/+121
| | | | | | | | It's not any harder to include debian package support than to include a spec file so here is the setup to build the equivalent debian package. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Update the spec file so it can build and install the documentationEric W. Biederman2005-07-151-4/+10
| | | | | | | | | If you don't want the documentation simply build with make RPMBUILD="rpmbuild --without docs" Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Add doc and install-doc targets to the MakefileEric W. Biederman2005-07-152-0/+19
| | | | | | | | This makes it straightforward for people wanting to build and install the git man pages and the rest of the documentation to do so. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Use gzip -f when building the git-core tarballEric W. Biederman2005-07-151-1/+1
| | | | | | | | 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>
* [PATCH] Add a RPMBUILD make variableEric W. Biederman2005-07-151-1/+2
| | | | | | | | 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>
* [PATCH] Update tags to record who made themEric W. Biederman2005-07-152-3/+10
| | | | | | | | | | | 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>
* [PATCH] Update git-tag-script to create the .git/refs/tags if it does not ↵Eric W. Biederman2005-07-151-0/+1
| | | | | | | | | | | | 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>
* [PATCH] Update the list of diagnostics for git-commit-treeEric W. Biederman2005-07-151-0/+4
| | | | | | | | 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>
* [PATCH] Add git-var a tool for reading interesting git variables.Eric W. Biederman2005-07-154-1/+130
| | | | | | | | | 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>
* [PATCH] ident.c: Disambiguate the error messages in setup_identEric W. Biederman2005-07-151-2/+2
| | | | | | | | | | | 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>
* [PATCH] Move git_author_info and git_commiter_info to ident.cEric W. Biederman2005-07-153-10/+12
| | | | | | | 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>
View Lorry Controller Status