aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* [PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LFJunio C Hamano2005-07-22
| | | | | | | | | | | | | | | | | | | The git-rev-parse command uses LF to separate each argument it parses, so its users at least need to set IFS to LF to be able to handle filenames with embedded SPs and TABs. Some commands, however, can take and do expect arguments with embedded LF, notably, "-S" (pickaxe) of diff family, so even this workaround does not work for them. When --sq flag to git-rev-parse is given, instead of showing one argument per line, it outputs arguments quoted for consumption with "eval" by the caller, to remedy this situation. As an example, this patch converts git-whatchanged to use this new feature. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Document "curl" requirements.Junio C Hamano2005-07-22
| | | | | | | Not just libcurl, but now we require curl executable as well. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Support more http features: https no cert, .netrc -> authDarrin Thompson2005-07-22
| | | | | | | | | | | | Cause setting environment variable GIT_SSL_NO_VERIFY to turn off curl's ssl peer verification. Only use curl for http transfers, instead of curl and wget. Make curl check ~/.netrc for credentials. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Install git-verify-tag-scriptEric W. Biederman2005-07-22
| | | | | | Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Cleanup: git-verify-tag-scriptEric W. Biederman2005-07-22
| | | | | | | | | | - Use git-rev-parse to allow sha1 tags references - When the tag does not verify set an appropriate exit status - Use git-sh-setup-script to verify the .git directory Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix a typo in git-unpack-objects documentation.Jan Veldeman2005-07-22
| | | | | | | | Fix a typo in git-unpack-objects documentation. Signed-off-by: Jan Veldeman <jan@mind.be> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] debian/ fixesRyan Anderson2005-07-22
| | | | | | | | Make debian/rules executable, and correct the spelling of rsync in debian/control. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] format-patch: --mbox and --check.Junio C Hamano2005-07-22
| | | | | | | | | | | Add --mbox option to export patches in a format resembling UNIX mbox, so that later they can be concatenated and fed to applymbox. Add --check to look for lines that introduce bogus whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] git-format-patch-script and mailinfo updates.Junio C Hamano2005-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] tools/applymbox: allow manual fixing and continuing after a failure.Junio C Hamano2005-07-22
| | | | | | | | | | | 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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] apply.c: --exclude=fnmatch-pattern option.Junio C Hamano2005-07-22
| | | | | | | | | | 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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] apply.c: handle incomplete lines correctly.Junio C Hamano2005-07-22
| | | | | | | | | | | | | 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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Add "git commit --all" since everybody seems to want it.Linus Torvalds2005-07-19
| | | | | | | | | This replaces git-diff-files --name-only | xargs git-update-cache git commit with a new "--all" argument to "git commit".
* git-send-pack: verify that sender is a proper superset of receiverLinus Torvalds2005-07-19
| | | | | | 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.
* Merge master.kernel.org:/pub/scm/gitk/gitkLinus Torvalds2005-07-18
|\
| * Make the diff display less gaudy.Paul Mackerras2005-07-18
| | | | | | | | | | The old style is still available as an option (we still need a preferences window so we can set/clear it though).
| * Allow short SHA1 IDs in the SHA1 entry field.Paul Mackerras2005-07-18
| |
| * Fix display of mode changes in details pane.Paul Mackerras2005-07-17
| | | | | | | | | | Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
| * First cut at displaying the diffs for a merge.Paul Mackerras2005-07-17
| | | | | | | | | | | | | | 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).
| * Make searching in files changed faster, and fix some bugs.Paul Mackerras2005-07-16
| | | | | | | | | | | | 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.
| * Add "Files" and "Pickaxe" to the find menu.Paul Mackerras2005-07-16
| | | | | | | | | | | | | | | | | | | | | | "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.
* | Merge three separate "fetch refs" functionsLinus Torvalds2005-07-16
| | | | | | | | | | 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-16
| | | | | | | | | | 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-16
| | | | | | | | | | | | | | | | 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-16
| | | | | | | | It had the test for the destination reversed.
* | Merge git-tools repository under "tools" subdirectoryLinus Torvalds2005-07-16
|\ \ | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05
| | | | | | | | | | | | changes to the index file.
| * | applypatch: use the new git-apply to apply patchesLinus Torvalds2005-06-05
| | | | | | | | | | | | | | | | | | 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-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | Of course, this requires a version of git that cares..
| * | cvs2git: escape <<EOF messages, and work around cvsps branch handlingLinus Torvalds2005-05-24
| | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. 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-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-17
| | | | | | | | | | | | | | | 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-17
| | | | | | | | | | | | Avoid the warnings from newer git versions.
| * | Get AUTHOR_DATE from the email Date: lineLinus Torvalds2005-05-01
| | | | | | | | | | | | | | | | | | | | | 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-30
| | | | | | | | | | | | Remove multiple empty lines, and empty lines at beginning and end.
| * | Fix up "applypatch" for the big git renameLinus Torvalds2005-04-29
| | | | | | | | | | | | Add "git-" prefixes to git commands.
| * | [PATCH] make dotest more amenable to commit message editingJames Bottomley2005-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | Also updates "mailinfo" to write the file list.
| * | Add "applypatch" and "dotest" scripts to tie it all together.Linus Torvalds2005-04-12
| | | | | | | | | | | | This should be getting it all pretty close to a working setup.
| * | Start of early patch applicator tools for git.Linus Torvalds2005-04-11
| / | | | | | | | | | | | | | | | | 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-16
| | | | | | | | | | | | | | | | 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-16
| | | | | | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 22:40:17 +0000