← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to debian/diff/0002-post-receive-email-defend-against-non-utf8-i18n.logou.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Nieder
  • Date: 2013-06-12 07:50:53 UTC
  • mfrom: (1.2.19) (2.1.31 experimental)
  • Revision ID: package-import@ubuntu.com-20130612075053-uue9xe0dq0rvm44y
Tags: 1:1.8.3.1-1
* merge branch debian-experimental
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/diff/0002-post-receive-email-defend-against-non-utf8-i18n.logou.diff
1
 
From d41b94fca5748b0e51f7d505641c396328714813 Mon Sep 17 00:00:00 2001
 
1
From 587c3ee17a8fbd7bd695e5aa5f9a0cb4ca599d46 Mon Sep 17 00:00:00 2001
2
2
From: Jonathan Nieder <jrnieder@gmail.com>
3
3
Date: Fri, 7 Oct 2011 04:06:02 -0500
4
 
Subject: [PATCH 02/12] post-receive-email: defend against non-utf8
5
 
 i18n.logoutputencoding setting
 
4
Subject: post-receive-email: defend against non-utf8 i18n.logoutputencoding
 
5
 setting
6
6
 
7
7
The post-receive-email example hook includes a description of the
8
8
repository taken from $GIT_DIR/description in the emails it sends.
21
21
Helped-by: Johannes Sixt <j6t@kdbg.org>
22
22
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
23
23
---
24
 
 contrib/hooks/post-receive-email |   12 ++++++------
 
24
 contrib/hooks/post-receive-email | 12 ++++++------
25
25
 1 file changed, 6 insertions(+), 6 deletions(-)
26
26
 
27
27
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
28
 
index dc184d0..b59e03c 100755
 
28
index bd45702..26dd0e6 100755
29
29
--- a/contrib/hooks/post-receive-email
30
30
+++ b/contrib/hooks/post-receive-email
31
 
@@ -464,7 +464,7 @@ generate_delete_branch_email()
 
31
@@ -465,7 +465,7 @@ generate_delete_branch_email()
32
32
        echo "       was  $oldrev"
33
33
        echo ""
34
34
        echo $LOGBEGIN
37
37
        echo $LOGEND
38
38
 }
39
39
 
40
 
@@ -540,11 +540,11 @@ generate_atag_email()
 
40
@@ -541,11 +541,11 @@ generate_atag_email()
41
41
                # performed on them
42
42
                if [ -n "$prevtag" ]; then
43
43
                        # Show changes since the previous release
51
51
                fi
52
52
                ;;
53
53
        *)
54
 
@@ -564,7 +564,7 @@ generate_delete_atag_email()
 
54
@@ -565,7 +565,7 @@ generate_delete_atag_email()
55
55
        echo "       was  $oldrev"
56
56
        echo ""
57
57
        echo $LOGBEGIN
60
60
        echo $LOGEND
61
61
 }
62
62
 
63
 
@@ -610,7 +610,7 @@ generate_general_email()
 
63
@@ -611,7 +611,7 @@ generate_general_email()
64
64
        echo ""
65
65
        if [ "$newrev_type" = "commit" ]; then
66
66
                echo $LOGBEGIN
69
69
                echo $LOGEND
70
70
        else
71
71
                # What can we do here?  The tag marks an object that is not
72
 
@@ -629,7 +629,7 @@ generate_delete_general_email()
 
72
@@ -630,7 +630,7 @@ generate_delete_general_email()
73
73
        echo "       was  $oldrev"
74
74
        echo ""
75
75
        echo $LOGBEGIN
79
79
 }
80
80
 
81
81
-- 
82
 
1.7.10
 
82
1.8.1.3
83
83