AgeCommit message (Collapse)Author
2005-07-22[PATCH] git-format-patch-script and mailinfo updates.Junio C Hamano
- avoid duplicating [PATCH] in the commit message body if the original commit has it already (happens for commits done from mails via applymbox). - check if the commit author is different from the one who is running the script, and emit an appropriate "From:" and "Date: " lines to the output. - with '--date', emit "Date: " line to preserve the original author date even for the user's own commit. - teach mailinfo to grok not just "From: " but "Date: ". The patch e-mail output by format-patch starts with the first line from the original commit message, prefixed with [PATCH], and optionally a From: line if you are reformatting a patch obtained from somebody else, a Date: line from the original commit if (1) --date is specified or (2) for somebody else's patch, and the rest of the commit message body. Expected use of this is to move the title line from the commit to Subject: when sending it via an e-mail, and leave the From: and the Date: lines as the first lines of your message. The mailinfo command has been changed to read Date: (in addition to From: it already understands) and do sensible things when running applymbox. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-22[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.Junio C Hamano
With "-c .dotest/0002" flag, the applymbox command can be told to use existing .dotest/patch file after hand-fixing the patch conflicts for the second patch in the mailbox, and continue on from that message, skipping the already applied first patch in .dotest/0001. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-22[PATCH] apply.c: --exclude=fnmatch-pattern option.Junio C Hamano
Adds --exclude=pattern option to the "git-apply" command. This was useful while reimporting the BKCVS patchset dump of the Linux kernel, starting at 2.4.0 and ending at 2.6.12-rc2 Ingo announced some time ago to exclude BitKeeper directory. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-22[PATCH] apply.c: handle incomplete lines correctly.Junio C Hamano
The parsing code had a bug that failed to recognize an incomplete line at the end of a fragment, and the fragment application code had a comparison bug to recognize such. Fix them to handle incomplete lines correctly. Add a test script for patches with various combinations of complete and incomplete lines to make sure the fix works. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-19Add "git commit --all" since everybody seems to want it.Linus Torvalds
This replaces git-diff-files --name-only | xargs git-update-cache git commit with a new "--all" argument to "git commit".
2005-07-19git-send-pack: verify that sender is a proper superset of receiverLinus Torvalds
This should make sure that if you have multiple people pushing to the same tree, they cannot overwrite each others work, but have to merge before being able to update the common reference tree.
2005-07-18Merge Torvalds
2005-07-18Make the diff display less gaudy.Paul Mackerras
The old style is still available as an option (we still need a preferences window so we can set/clear it though).
2005-07-18Allow short SHA1 IDs in the SHA1 entry field.Paul Mackerras
2005-07-17Fix display of mode changes in details pane.Paul Mackerras
Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17First cut at displaying the diffs for a merge.Paul Mackerras
We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).
2005-07-17Make searching in files changed faster, and fix some bugs.Paul Mackerras
We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-16Merge three separate "fetch refs" functionsLinus Torvalds
It really just boils down to one "get_remote_heads()" function, and a common "struct ref" structure definition.
2005-07-16git-send-pack: add "--all" option to send all refs to the other sideLinus Torvalds
This affects only refs that the other side doesn't already have. The ones it has are still filtered by the ref selection.
2005-07-16git-fetch-script: fix http:// breakageLinus Torvalds
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.
2005-07-16Fix git-fetch-script breakageLinus Torvalds
It had the test for the destination reversed.
2005-07-16Merge git-tools repository under "tools" subdirectoryLinus Torvalds
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.
2005-07-16Prepare git-tools for merging into the main git archiveLinus Torvalds
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.
2005-07-16git-convert-cache: fix up file modes in trees tooLinus Torvalds
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.
2005-07-16[PATCH] Documentation: describe short-hand used in fetch/pull.Junio C Hamano
Describe short-hand for remote repository used in fetch/pull. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-16[PATCH] fetch/pull: short-hand notation for remote repositories.Junio C Hamano
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 <> Signed-off-by: Linus Torvalds <>
2005-07-16Add "Files" and "Pickaxe" to the find menu.Paul Mackerras
"Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16Be slightly smarter about git-daemon client shutdownLinus Torvalds
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.
2005-07-16[PATCH] Documentation: update recommended workflow when working with others.Junio C Hamano
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 <> Signed-off-by: Linus Torvalds <>
2005-07-16[PATCH] Documentation: adjust cvsimport command line.Junio C Hamano
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 <> Signed-off-by: Linus Torvalds <>
2005-07-16git-daemon: actually remember the children we have outstandingLinus Torvalds
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.
2005-07-16git-daemon: keep track of childrenLinus Torvalds
We don't want them as zombies, and eventually we'll want to limit their number. Right now we just count them.
2005-07-15Ahh, the heady days of 0.99 patchfilesv0.99.1Linus Torvalds
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.
2005-07-15Fix up "make doc"Linus Torvalds
Fix 'git-var.txt' and use "-b xhtml11" instead of "-b css-embedded" to make asciidoc 7.0.1 happy.
2005-07-15[PATCH] Documentation: pull, push, packing repository and working with others.Junio C Hamano
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 <> Signed-off-by: Linus Torvalds <>
2005-07-15[PATCH] Documentation: update tutorial to talk about push.Junio C Hamano
Talk about publishing to a public repository. Also fixes a couple of typos. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-15[PATCH] Initial support for building a debian package (.deb)Eric W. Biederman
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 <> Signed-off-by: Linus Torvalds <>
2005-07-15[PATCH] Update the spec file so it can build and install the documentationEric W. Biederman
If you don't want the documentation simply build with make RPMBUILD="rpmbuild --without docs" Signed-off-by: Eric W. Biederman <> Signed-off-by: Linus Torvalds <>
2005-07-15[PATCH] Add doc and install-doc targets to the MakefileEric W. Biederman
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 <> Signed-off-by: Linus Torvalds <>
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 <> Signed-off-by: Linus Torvalds <>
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 <> Signed-off-by: Linus Torvalds <>
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 <>
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 <> Signed-off-by: Linus Torvalds <>
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 <> Signed-off-by: Linus Torvalds <>
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 <>
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 <> [ Fixed grammar ] Signed-off-by: Linus Torvalds <>
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 <>
2005-07-15Add "--inetd" flag to git-daemonLinus Torvalds
All credit go to Alexey Nezhdanov <>, 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.