rpms/guilt/devel ecryptfs-new-git-regression-fixes.patch, NONE, 1.1 guilt.spec, 1.2, 1.3
Eric Sandeen (sandeen)
fedora-extras-commits at redhat.com
Tue Jun 3 15:28:05 UTC 2008
Author: sandeen
Update of /cvs/pkgs/rpms/guilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14510
Modified Files:
guilt.spec
Added Files:
ecryptfs-new-git-regression-fixes.patch
Log Message:
* Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
- Fix regression test output for new versions of git (#440169)
ecryptfs-new-git-regression-fixes.patch:
--- NEW FILE ecryptfs-new-git-regression-fixes.patch ---
Index: guilt-0.30/regression/scaffold
===================================================================
--- guilt-0.30.orig/regression/scaffold 2008-04-10 18:24:06.000000000 -0500
+++ guilt-0.30/regression/scaffold 2008-06-03 08:36:07.818456572 -0500
@@ -26,7 +26,9 @@ function die
function replace_path
{
sed -e "s,$PWD,PATH,g" \
- -e "s,$REG_DIR,REGDIR,g"
+ -e "s,$REG_DIR,REGDIR,g" \
+ -e "s,\.\.\. initial, initial,g" \
+ -e "s,^Already on branch,^Already on,g"
}
function filter_dd
Index: guilt-0.30/regression/t-010.out
===================================================================
--- guilt-0.30.orig/regression/t-010.out 2008-04-10 18:24:06.000000000 -0500
+++ guilt-0.30/regression/t-010.out 2008-06-03 08:37:02.637035981 -0500
@@ -1,7 +1,7 @@
% setup_git_repo
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init
% list_files
d .git/patches
@@ -16,8 +16,8 @@ d .git/patches/master
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init -a
% list_files
d .git/patches
@@ -32,8 +32,8 @@ d .git/patches/master
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% reset_git_repo
-Already on branch "master"
-HEAD is now at d485041... initial
+Already on "master"
+HEAD is now at d485041 initial
% guilt-init -n
% list_files
d .git/patches
Index: guilt-0.30/regression/t-027.out
===================================================================
--- guilt-0.30.orig/regression/t-027.out 2008-06-03 09:35:37.000000000 -0500
+++ guilt-0.30/regression/t-027.out 2008-06-03 09:35:45.759711961 -0500
@@ -11,7 +11,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb76406
f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
% git-reset --hard HEAD
-HEAD is now at d485041... initial
+HEAD is now at d485041 initial
% guilt-push modify
Applying patch..modify
Patch applied.
Index: guilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/guilt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guilt.spec 11 Apr 2008 18:44:03 -0000 1.2
+++ guilt.spec 3 Jun 2008 15:27:17 -0000 1.3
@@ -1,6 +1,6 @@
Name: guilt
Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scripts to manage quilt-like patches on top of git
Group: Development/Tools
@@ -13,6 +13,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: asciidoc, xmlto, git-core
+Patch0: ecryptfs-new-git-regression-fixes.patch
+
%description
Guilt allows one to use quilt functionality on top of a Git repository.
Changes are maintained as patches which are committed into Git. Commits can
@@ -24,6 +26,8 @@
%prep
%setup -q
+%patch0 -p1
+
%build
make %{?_smp_mflags}
@@ -46,6 +50,9 @@
%{_mandir}/man7/guilt*.7*
%changelog
+* Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
+- Fix regression test output for new versions of git (#440169)
+
* Fri Apr 11 2008 Eric Sandeen <sandeen at redhat.com> 0.30-1
- New upstream version
More information about the scm-commits
mailing list