summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Fix git-commit-script to output on stderr when -v failsMarco Costalba2005-08-201-6/+6
| | | | | | | | | | | | | | When git-commit-script is called with -v option and verify test fails result is print on stdout instead of stderr. [jc: The original patch from Marco updated git-commit-script that still had the piece of code in question, which has been moved to an example hook script on its own, so I transplanted the patch to that new file instead.] Signed-off-by: Marco Costalba <mcostalba@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-resolve: dying is good, not showing help is bad.Junio C Hamano2005-08-201-4/+8
| | | | | | | Recent change to make sure we get commit, not tag, accidentally removed its feature of giving a usage help message when it died. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make sample pre-commit hook output Emacs friendly.Junio C Hamano2005-08-201-1/+2
| | | | | | | | Use the common error message format, "filename:lineno: body"; this way, problematic lines can be jumped to from the Emacs compilation buffer by C-x `. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Call prune-packed from "git prune" as well.Junio C Hamano2005-08-192-6/+16
| | | | | | Add -n (dryrun) flag to git-prune-packed, and call it from "git prune". Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add hooks to tools/git-applypatch.Junio C Hamano2005-08-193-18/+97
| | | | | | | This teachs git-applypatch, which is used from git-applymbox, three hooks, similar to what git-commit-script uses. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add commit hook and make the verification customizable.Junio C Hamano2005-08-194-52/+105
| | | | | | | | | | | | | | | | | | | | There are three hooks: - 'pre-commit' is given an opportunity to inspect what is being committed, before we invoke the EDITOR for the commit message; - 'commit-msg' is invoked on the commit log message after the user prepares it; - 'post-commit' is run after a successful commit is made. The first two can interfere to stop the commit. The last one is for after-the-fact notification. The earlier built-in commit checker is now moved to pre-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Allow file removal when "git commit --all" is used.Junio C Hamano2005-08-191-2/+2
| | | | | | | | | | | | | | | | | | After you deleted files from your working tree, automatic git-update-cache used when the "--all" flag is given to "git commit" barfs because it lacks the --remove flag. It can be argued that this is a feature; people should be careful and something with a grave consequence like removing files should be done manually, in which case the current behaviour may be OK. The patch is for people who thinks the user who uses the "--all" flag deserves the danger that comes with the convenience. Comments? Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge from gitkJunio C Hamano2005-08-191-43/+163
|\
| * Display the contents of a tag when the user clicks on it.Paul Mackerras2005-08-191-29/+64
| | | | | | | | | | | | | | This just displays the result of git-cat-file on the tag in the details pane. If the tag is a "direct" tag (the tag file contains the SHA1 ID of a commit rather than a tag), we show the tag name and SHA1 ID.
| * Added re-read refs command, and display all refs.Paul Mackerras2005-08-191-6/+93
| | | | | | | | | | | | | | | | | | | | These are features requested by Junio. Any plain file under .git/refs whose contents start with 40 hex characters is taken as a reference and displayed like a head but with a light blue background (unless it is in .git/refs/tags or .git/refs/heads, in which case it is displayed as before). There is now a "Reread references" menu item in the File menu which re-reads all the plain files under .git/refs and redisplays any references that have changed.
| * Save the maxwidth setting in the ~/.gitk file.Paul Mackerras2005-08-191-0/+2
| |
| * Fix a bug where commits with no children weren't marked as on-screen.Paul Mackerras2005-08-191-8/+4
| | | | | | | | | | This problem was revealed by running gitk --all on Wolfgang Denk's u-boot repository.
* | [PATCH] git-rev-list: avoid crash on broken repositorySergey Vlasov2005-08-191-0/+2
| | | | | | | | | | | | | | | | When following tags, check for parse_object() success and error out properly instead of segfaulting. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Fix git-format-patch-script to handle empty messagesMarco Costalba2005-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a commit with an empty message there is no mandatory empty line between headers and body [jc: This makes --mbox output valid even when the commit message does not have anything but its first line, which the one I wrote botched. One side-effect is that it adds an extra blank line at the end even if it has more than one lines, which will be eaten by the receiving end. As Marco says, this is a stop-gap measure. This script needs to be split into two, one that gets the format specifier and a commit ID to write to its standard output, and another that drives that one reading from rev-list. I'll fix things properly when that happens by rewriting the former part in Perl or something more reasonable than the current shell, sed and grep mishmash.] Signed-off-by: Marco Costalba <mcostalba@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix __attribute__ changes.Junio C Hamano2005-08-191-2/+1
| | | | | | | | | | | | | | It cannot be checked with #ifndef, if you really think about what it does which cannot be done only with the preprocessor. My thinko. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Spell __attribute__ correctly in cache.h.Jason Riedy2005-08-181-1/+1
| | | | | | | | | | | | | | Sun's cc doesn't know __attribute__. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Also make git-rebase-script stricter about dirty working tree.Junio C Hamano2005-08-181-1/+3
| | | | | | | | | | | | | | Otherwise the first commit rebase makes could include whatever dirty state the original working tree had. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git-applymbox: verify that index is cleanLinus Torvalds2005-08-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This makes git-applymbox verify that the index matches the current HEAD before it starts applying patches. Otherwise, you might have updated the index with unrelated changes, and the first patch will commit not just the patch from the mbox, but also any changes you had in your index. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Link the glossary document from the main manual.Junio C Hamano2005-08-181-6/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Stupid typo fix for git rebase.Junio C Hamano2005-08-181-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Updates to glossaryJohannes Schindelin2005-08-181-6/+22
| | | | | | | | | | | | | | | | Changes to the descriptions of tree and tag objects, a link for ent, and descriptions for rewind, rebase and core git were added. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with gitk --parents change.Junio C Hamano2005-08-181-69/+32
|\ \ | |/
| * Use the --parents flag to git-rev-list.Paul Mackerras2005-08-181-69/+32
| | | | | | | | | | | | | | With --parents, git-rev-list gives us the list of parents on the first line of each commit. We use that rather than looking for the parent: lines in the commit body, since this way we get to know about the grafts for free.
* | [PATCH] updates for Documentation/howto/using-topic-branches.txtLuck, Tony2005-08-181-2/+113
| | | | | | | | | | | | | | | | | | | | | | Small fix (use "git branch" to make branches, rather than "git checkout -b"). Optimization for trivial patches (apply to release and merge to test). Three sample scripts appended. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Add Makefile target glossary.htmlJohannes Schindelin2005-08-182-1/+76
| | | | | | | | | | | | | | | | This also includes a script which does the sorting, and introduces hyperlinks for every described term. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with gitkJunio C Hamano2005-08-171-167/+461
|\ \ | |/
| * Allow graph lines to jump through hyperspace.Paul Mackerras2005-08-181-166/+413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the graph gets too wide (as defined by the maxwidth variable, which can be set in ~/.gitk), we can now terminate graph lines with an arrow pointing downwards, and reintroduce them later with an arrow pointing upwards when we need them. This makes the graph much less cluttered on large repositories such as the linux kernel. Unfortunately this has made it slower; it takes about 10 seconds user time on the linux-2.6 repository on my machine now, compared to 6 seconds before. I'll have to work on optimizing that. Also on the todo list are making the arrow heads active (so if you click on them you jump to the other end) and improving the placement of the null entry.
| * Add graft support.Paul Mackerras2005-08-171-1/+48
| | | | | | | | | | | | We read .git/info/grafts and use the information in there to override the list of parents we get from git-rev-list or git-cat-file.
* | [PATCH] Assorted changes to glossaryJohannes Schindelin2005-08-171-43/+61
| | | | | | | | | | | | | | | | | | Based on the discussion on the git list, here are some important changes to the glossary. (There is no cache, but an index. Use "object name" rather than "SHA1". Reorder. Clarify.) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make rebase script saner.Junio C Hamano2005-08-171-7/+10
| | | | | | | | | | | | | | | | It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make sure alternates are carried over from the original repository.Junio C Hamano2005-08-171-1/+5
| | | | | | | | | | | | | | | | When we create a cheap local clone by pointing at the object databse of the original repository, we forgot to take the alternates the original repository might have had into account. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix git-commit without paths.Junio C Hamano2005-08-171-2/+4
| | | | | | | | | | | | | | | | The earlier one to grab output from diff-files --name-only has a grave bug that when no paths are given it ended up doing the equivalent of "git-commit --all", which was not what I intended. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Make git-update-cache take relative pathnamesLinus Torvalds2005-08-171-0/+2
| | | | | | | | | | | | | | | | This also makes "./filename" acceptable as a side effect, since the pathname normalization handles that too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Export relative path handling "prefix_path()" functionLinus Torvalds2005-08-172-1/+2
| | | | | | | | | | | | | | | | | | Not all programs necessarily have a pathspec array of pathnames, some of them (like git-update-cache) want to do things one file at a time. So export the single-path interface too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git-cvsimport - remove hardcoded reference to originMartin Langhoff2005-08-171-1/+1
| | | | | | | | | | | | | | ... in the newly introduced merge detection code. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Add merge detection to git-cvsimportMartin Langhoff2005-08-172-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | Added -m and -M flags for git-cvsimport to detect merge commits in cvs. While this trusts the commit message, in repositories where merge commits indicate 'merged from FOOBRANCH' the import works surprisingly well. Even if some merges from CVS are bogus or incomplete, the resulting branches are in better state to go forward (and merge) than without any merge detection. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Add GIT glossaryJohannes Schindelin2005-08-171-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | [jc: This is the version without asciidoc cross references; Johannes says that the cross referenced one is generated from this file using a Perl script, so I am placing this as the source, and expecting to later receive the script and a Makefile entry or two to massage this file into the final HTML or whatever form.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Let git-format-patch-script write on stdoutMarco Costalba2005-08-171-1/+1
| | | | | | | | | | | | | | | | Avoid that git-format-patch writes out patch series information on stderr when there are no errors Signed-off-by: Marco Costalba <mcostalba@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Be consistent in naming of remote headsKris Shannon2005-08-171-1/+1
| | | | | | | | | | | | | | | | The _remote_name variable used for messages does not need the refs/heads/ prefix included. Signed-off-by: Kris Shannon <kris.shannon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] use it's and its correctly in documentationGreg Louis2005-08-172-6/+6
| | | | | | | | | | | | | | | | | | | | At one place in Documentation/tutorial.txt and several in the base README, its was wrongly used in place of it's or vice versa. One instance remains somewhere in Documentation/howto/, which I didn't correct because it's in a quotation. Signed-off-by: Greg Louis <glouis@dynamicro.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Also handle CVS branches with a '/' in their nameJohannes Schindelin2005-08-172-4/+10
| | | | | | | | | | | | | | | | | | | | | | I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, substitute that character to a '-' by default (override with "-s <subst>"). This should work well, despite the fact that a division and a difference are completely different :-) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] When copying or renaming, keep the mode, pleaseJohannes Schindelin2005-08-172-2/+43
| | | | | | | | | | | | | | | | | | | | | | Without this patch, git-apply does not retain the mode when renaming or copying files. [jc: Good catch, Johannes. I added a test case to demonstrate the breackage in the original.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Change git-branch to list branchesKalle Valo2005-08-171-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | If no argument provided to `git branch`, show available branches and mark current branch with star. This is based on patch written by Amos Waterland <apw@rossby.metr.ou.edu>. [jc: and I changed it to handle subdirectories under refs/heads/ as well.] Signed-off-by: Kalle Valo <Kalle.Valo@iki.fi> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-commit: pass explicit path to git-diff-files.Junio C Hamano2005-08-171-3/+8
| | | | | | | | | | | | | | | | When running "git commit" with explicit path arguments, allow it to take directory name. This makes "git commit Documentation/" to commit everything that is changed under Documentation/ directory. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Pass options to underlying git-rev-list from show-branches.Junio C Hamano2005-08-171-8/+16
| | | | | | | | | | | | This lets you say "git show-branches --max-count=30". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add --symbolic flag to git-rev-parse.Junio C Hamano2005-08-171-12/+18
| | | | | | | | | | | | This is most useful with --all, --revs-only, --no-flags and --verify. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach applymbox to keep the Subject: line.Junio C Hamano2005-08-163-4/+27
| | | | | | | | | | | | | | | | | | This corresponds to the -k flag to git format-patch --mbox option. The option should probably not be used when applying a real e-mail patch, but is needed when format-patch and applymbox pair is used for cherrypicking. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use LF and allow comments in objects/info/alternates file.Junio C Hamano2005-08-161-11/+15
| | | | | | | | | | | | | | | | | | Yes, using the same format for the file and the environment variable was a big mistake. This uses LF as the path separator, and allows lines that begin with '#' to be comments. ':' is no longer a separator in objects/info/alternates file. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-format-patch fixes.Junio C Hamano2005-08-161-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | Introduces --keep-subjects flag to tell it not to munge the first line of the commit message. Running "git applymbox" on the output from "git format-patch -m -k" would preserve the original commit information better this way. At the same time, prefix Subject: on the first line of the commit, to help people cut&copy. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Improve handling of "." and ".." in git-diff-*Linus Torvalds2005-08-163-42/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes up usage of ".." (without an ending slash) and "." (with or without the ending slash) in the git diff family. It also fixes pathspec matching for the case of an empty pathspec, since a "." in the top-level directory (or enough ".." under subdirectories) will result in an empty pathspec. We used to not match it against anything, but it should in fact match everything. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status