git/git-commit.sh, branch v1.4.0-rc2

Merge branch 'sp/reflog'

2006-06-04T06:59:03Z

* sp/reflog: fetch.c: do not pass uninitialized lock to unlock_ref(). Test that git-branch -l works. Verify git-commit provides a reflog message. Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/ Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.

Allow multiple -m options to git-commit.

2006-05-31T22:40:47Z

I find it very convenient to be able to supply multiple paragraphs of text on the command line with a single git-commit call. This change permits multiple -m/--message type options to be supplied to git-commit with each message being added as its own paragraph of text in the commit message. The -m option is still not permitted with -c/-C/-F nor are multiple occurrences of these options permitted. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Add instructions to commit template.

2006-05-26T08:55:01Z

New users can be irritated by the git status text in their editor. Let's give them a short help. Signed-off-by: Martin Waitz Signed-off-by: Junio C Hamano

Merge branch 'master' into sp/reflog

2006-05-24T23:49:24Z

* master: (90 commits) fetch.c: remove an unused variable and dead code. Clean up sha1 file writing Builtin git-cat-file builtin format-patch: squelch content-type for 7-bit ASCII CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. add more informative error messages to git-mktag remove the artificial restriction tagsize < 8kb git-rebase: use canonical A..B syntax to format-patch git-format-patch: now built-in. fmt-patch: Support --attach fmt-patch: understand old notation Teach fmt-patch about --keep-subject Teach fmt-patch about --numbered fmt-patch: implement -o fmt-patch: output file names to stdout Teach fmt-patch to write individual files. built-in tar-tree and remote tar-tree Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. Builtin git-show-branch. Builtin git-apply. ...

git status: skip empty directories, and add -u to show all untracked files

2006-05-23T07:36:51Z

By default, we use --others --directory to show uninteresting directories (to get user's attention) without their contents (to unclutter output). Showing empty directories do not make sense, so pass --no-empty-directory when we do so. Giving -u (or --untracked) disables this uncluttering to let the user get all untracked files. Signed-off-by: Junio C Hamano

Include ref log detail in commit, reset, etc.

2006-05-19T22:03:21Z

When updating a ref at the direction of the user include a reason why head was changed as part of the ref log (assuming it was enabled). Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Ensure author & committer before asking for commit message.

2006-05-14T23:27:03Z

It's better to find out you need to fix your author and committer information before you enter a long commit message. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

git-commit --amend: two fixes.

2006-04-20T09:51:12Z

When running "git commit --amend" only to fix the commit log message without any content change, we mistakenly showed the git-status output that says "nothing to commit" without commenting it out. If you have already run update-index but you want to amend the top commit, "git commit --amend --only" without any paths should have worked, because --only means "starting from the base commit, update-index these paths only to prepare the index to commit, and perform the commit". However, we refused -o without paths. Signed-off-by: Junio C Hamano

Shell utilities: Guard against expr' magic tokens.

2006-04-13T23:45:48Z

Some words, e.g., `match', are special to expr(1), and cause strange parsing effects. Track down all uses of expr and mangle the arguments so that this isn't a problem. Signed-off-by: Mark Wooding Signed-off-by: Junio C Hamano

git-commit: do not muck with commit message when no_edit is set.

2006-04-12T18:45:18Z

Spotted by Linus and Darrin Thompson. When we took a commit message from -F with an incomplete line, we appended "git status" output, which ended up attaching a lone "#" at the end. We still need the "do we have anything to commit?" check by running "status" (which has to know what to do in different cases with -i/-o/-a), but there is no point appending its output to the proposed commit message given by the user. Signed-off-by: Junio C Hamano