user/sven/git.git/git-commit.sh, branch v1.4.1.1

Racy GIT (part #3)

2006-06-29T21:48:22Z

Commit 29e4d3635709778bcc808dbad0477efad82f8d7e fixed the underlying update-index races but git-commit was not careful enough to preserve the index file timestamp when copying the index file. This caused t3402 test to occasionally fail. Signed-off-by: Junio C Hamano

Fix expr usage for FreeBSD

2006-06-27T17:56:05Z

Some implementations of "expr" (e.g. FreeBSD's) fail, if an argument starts with a dash. Signed-off-by: Dennis Stosberg Signed-off-by: Junio C Hamano

Merge branch 'jc/squash'

2006-06-26T21:36:10Z

* jc/squash: git-merge --squash

git-commit: filter out log message lines only when editor was run.

2006-06-25T07:35:52Z

The current behaviour strips out lines starting with a # even when fed through stdin or -m. This is particularly bad when importing history from another SCM (tailor 0.9.23 uses git-commit). In the best cases all lines are stripped and the commit fails with a confusing "empty log message" error, but in many cases the commit is done, with loss of information. Note that it is quite peculiar to just have "#" handled as a leading comment char here. One commonly meet CVS: or CG: or STG: as prefixes, and using GIT: would be more robust as well as consistent with other commit tools. However, that would break any tool relying on the # (if any). Signed-off-by: Yann Dirson Signed-off-by: Junio C Hamano

git-merge --squash

2006-06-24T08:11:19Z

Some people tend to do many little commits on a topic branch, recording all the trials and errors, and when the topic is reasonably cooked well, would want to record the net effect of the series as one commit on top of the mainline, removing the cruft from the history. The topic is then abandoned or forked off again from that point at the mainline. The barebone porcelainish that comes with core git tools does not officially support such operation, but you can fake it by using "git pull --no-merge" when such a topic branch is not a strict superset of the mainline, like this: git checkout mainline git pull --no-commit . that-topic-branch : fix conflicts if any rm -f .git/MERGE_HEAD git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged This however does not work when the topic branch is a fast forward of the mainline, because normal "git pull" will never create a merge commit in such a case, and there is nothing special --no-commit could do to begin with. This patch introduces a new option, --squash, to support such a workflow officially in both fast-forward case and true merge case. The user-level operation would be the same in both cases: git checkout mainline git pull --squash . that-topic-branch : fix conflicts if any -- naturally, there would be : no conflict if fast forward. git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged When the current branch is already up-to-date with respect to the other branch, there truly is nothing to do, so the new option does not have any effect. This was brought up in #git IRC channel recently. Signed-off-by: Junio C Hamano

git-commit: allow -e option anywhere on command line

2006-06-23T23:55:51Z

Previously, the command 'git-commit -e -m foo' would ignore the '-e' option because the '-m' option overwrites the no_edit flag during sequential option parsing. Now we cause -e to reset the no_edit flag after all options are parsed. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'master' into next

2006-06-01T01:24:45Z

* master: send-email: only 'require' instead of 'use' Net::SMTP Allow multiple -m options to git-commit.

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

Merge branch 'master' into next

2006-05-26T23:36:20Z

* master: Call builtin ls-tree in git-cat-file -p built-in format-patch: various fixups. Add instructions to commit template.

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