diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:11:17 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:11:17 -0400 |
| commit | e75c55844fd0ff96d00173574b1e49cc472ca928 (patch) | |
| tree | 1146c04d598cdb0857e9072e82eee2338f8ee4a4 /contrib | |
| parent | 8f353ee57a2f79697f8dea80ad3174998586bc75 (diff) | |
| parent | 1aa3d01f870a68dc46a872c83f9cd051f172f9b3 (diff) | |
| download | git-e75c55844fd0ff96d00173574b1e49cc472ca928.tar.gz | |
Merge branch 'maint'
* maint:
Yet more 1.5.3.5 fixes mentioned in release notes
cvsserver: Use exit 1 instead of die when req_Root fails.
git-blame shouldn't crash if run in an unmerged tree
git-config: print error message if the config file cannot be read
fixing output of non-fast-forward output of post-receive-email
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/hooks/post-receive-email | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index b188aa3d67..2aa9bb501c 100644 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -331,7 +331,7 @@ generate_update_branch_email() echo " via $rev ($revtype)" done - if [ -z "$fastforward" ]; then + if [ "$fast_forward" ]; then echo " from $oldrev ($oldrev_type)" else # 1. Existing revisions were removed. In this case newrev is a |