[git-bugzilla] * Wed Jul 28 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.4.20091211git - Attach

[Lubomir Rintel]

commit f1c289d0d2cc0a58bf791653e5c80547ad680cb6
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Fri Jul 30 11:01:13 2010 +0200

    * Wed Jul 28 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.4.20091211git
    - Attach git-am -able patches

 0003-Attach-git-am-able-patches.patch |   26 ++++++++++++++++++++++++++
 git-bugzilla.spec                     |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0003-Attach-git-am-able-patches.patch b/0003-Attach-git-am-able-patches.patch
new file mode 100644
index 0000000..f15e6d8
--- /dev/null
+++ b/0003-Attach-git-am-able-patches.patch
@@ -0,0 +1,26 @@
+From e6dadfe44934a26978b97f2e951d72d04165e339 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Wed, 28 Jul 2010 15:39:19 +0200
+Subject: [PATCH] Attach git am -able patches
+
+---
+ git-send-bugzilla.pl |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/git-send-bugzilla.pl b/git-send-bugzilla.pl
+index e40402e..7fe5693 100755
+--- a/git-send-bugzilla.pl
++++ b/git-send-bugzilla.pl
+@@ -69,7 +69,8 @@ sub get_patch_info {
+ 	$comment .= "\n---\n" unless $comment eq '';
+ 	$comment .= `git diff-tree --stat --no-commit-id $rev1 $rev2`;
+ 
+-	my $patch = `git diff-tree -p $rev1 $rev2`;
++	my $range = $rev2 ? "..$rev2" : " -1";
++	my $patch = `git format-patch --stdout $rev1$range`;
+ 
+ 	return ($description, $comment, $patch);
+ }
+-- 
+1.7.1
+
diff --git a/git-bugzilla.spec b/git-bugzilla.spec
index 743f56a..6d4c985 100644
--- a/git-bugzilla.spec
+++ b/git-bugzilla.spec
@@ -1,6 +1,6 @@
 Name:           git-bugzilla
 Version:        0
-Release:        0.3.20091211git%{?dist}
+Release:        0.4.20091211git%{?dist}
 Summary:        Attach patches to a bugzilla bug
 
 Group:          Development/Tools
@@ -11,6 +11,7 @@ URL:            http://git.collabora.co.uk/?p=user/cassidy/git-bugzilla
 Source0:        %{name}-fc2be92.tar.gz
 Patch0:         0001-Do-not-default-to-GNOME-bugzilla.patch
 Patch1:         0002-Fix-a-warning-about-uninitialized-value.patch
+Patch2:         0003-Attach-git-am-able-patches.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  asciidoc
@@ -28,6 +29,7 @@ Add commits as attachments to a Bugzilla bug.
 %setup -q -n %{name}
 %patch0 -p1 -b .gnome
 %patch1 -p1 -b .warn
+%patch2 -p1 -b .gitam
 
 
 %build
@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 28 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.4.20091211git
+- Attach git-am -able patches
+
 * Sun Feb 21 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.3.20091211git
 - Require Crypt::SSLeay (Bruce Cowan, #559898)