summaryrefslogtreecommitdiff
path: root/git-commit-script
Commit message (Collapse)AuthorAgeFilesLines
* Big tool rename.Junio C Hamano2005-09-071-233/+0
| | | | | | | | | | | | | | | | | | | As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use 'git status' now it can handle initial commit.Junio C Hamano2005-08-311-25/+20
| | | | | | | Update 'git commit' to use the updated `git status`. Also earlier the `-s` flag was ignored for the initial commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git commit: Allow editing on all occasions.Junio C Hamano2005-08-291-0/+3
| | | | | | | | | | Sometimes it may be handy to be able to edit messages that come from somewhere other than an existing commit. This makes 'git commit -F <file> -e' to start editor with the initial log message contents taken from <file>. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Show the branch name more prominently in "git status".Junio C Hamano2005-08-281-2/+2
| | | | | | | When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Accept -m and friends for initial commits and merge commits.Junio C Hamano2005-08-261-47/+39
| | | | | | Yes it was irritating not to be able to do so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add commit hook and make the verification customizable.Junio C Hamano2005-08-191-52/+23
| | | | | | | | | | | | | | | | | | | | 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>
* 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>
* 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>
* Tentative fix to git-commit-scriptJunio C Hamano2005-08-151-5/+11
| | | | | | | | | | | | | | The recent change to give the multiple commit message source was not carrying over the authorship information from -C/-c commits correctly. The export of the environment variable happens only in the subprocess, not the main process that eventually runs git-commit-tree. The right fix might be to teach git-commit-script to grok the From: and Date: lines at the beginning of the commit message just like git-applymbox knows how, but this has to do until that enhancement happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --signoff and --verify option to git commit.Junio C Hamano2005-08-131-4/+72
| | | | | | | | | | | | | As brought up in the discussion which followed a patch to add a signed-off-by line with the --sign flag to format-patch from Johannes Schindelin, add --signoff to the git commit command. Also add --verify to make sure the lines you introduced are clean, which is more useful in commit but not very much in format-patch as it was originally implemented, because finding botches at format-patch time is too late. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit: log parameter updates.Junio C Hamano2005-08-091-22/+105
| | | | | | | | | | | | | | | | While moving '-m' to make room for CVS compatible "here is the log message", enhance source of log parameters. -m 'message': a command line parameter. -F <file> : a file (use '-' to read from stdin). -C <commit> : message in existing commit. -c <commit> : message in existing commit (allows further editing). Longer option names for these options are also available. While we are at it, get rid of shell array bashism. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-commit-script fix for degenerated mergeJohannes Schindelin2005-08-051-2/+2
| | | | | | | | | | | | | | | If merging results in an unchanged tree, git-commit-script should not complain that there's nothing to commit. Also, add "[--all]" to usage(). [jc: usually there is no reason to record an unchanging merge, but this code path is triggered only when there is a nontrivial merge that needed to be resolved by hand, and we should be able to record the fact that these two tree heads are dealt with as a regular two-parent commit in order to help later merges.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Audit rev-parse users.Junio C Hamano2005-07-221-1/+1
| | | | | | | | This patch changes rev-parse users that pass a single argument that is supposed to be a rev parameter to use "--verify". Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add "git commit --all" since everybody seems to want it.Linus Torvalds2005-07-191-1/+5
| | | | | | | | | This replaces git-diff-files --name-only | xargs git-update-cache git commit with a new "--all" argument to "git commit".
* Add "git-sh-setup-script" for common git shell script setupLinus Torvalds2005-07-081-7/+3
| | | | | | | | | | It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script || die "Not a git archive" to make the rest of the git scripts more careful and readable.
* [PATCH] git-commit-script: get commit message from an existing one.Junio C Hamano2005-06-251-8/+67
| | | | | | | | With -m flag specified, git-commit-script takes the commit message along with author information from an existing commit. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Let "git commit" take arguments for files to commit.Linus Torvalds2005-06-201-0/+1
| | | | | | | | | | It does a "git-update-cache" on the arguments, meaning that you can commit files without doing a separate "git-update-cache". This commit was done with git commit git-commit-script for example.
* Make "git commit" clean up after itselfLinus Torvalds2005-06-191-5/+9
| | | | Noted by Jeff.
* Make "git commit" handle initial commits tooLinus Torvalds2005-06-141-12/+31
| | | | No need to confuse ex-CVS users with a complex initial commit sequence.
* Remove MERGE_HEAD after committing mergeLinus Torvalds2005-06-081-1/+2
|
* Make "git commit" work correctly in the presense of a manual mergeLinus Torvalds2005-06-081-2/+13
| | | | | | This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it.
* [PATCH] git: git-commit-script ignores $GIT_DIRAlexey Guzeev2005-06-011-1/+1
|
* [PATCH] Buglets fix in the new two scriptsJunio C Hamano2005-05-301-3/+1
| | | | | | | | | | | | | Should be obvious... - Use $VISUAL, $EDITOR, in this order if set, and fall back on vi. - Status R, C, D, N usually are followed by number, so adjust case arms to that pattern. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Add "commit" helper scriptLinus Torvalds2005-05-301-0/+15
This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating.