public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/guilt] rawhide: Rebase to upstream v0.37.1
@ 2026-08-27 16:23 Eric Sandeen
0 siblings, 0 replies; only message in thread
From: Eric Sandeen @ 2026-08-27 16:23 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/guilt
Branch : rawhide
Commit : c3fcab8cb34b119f4d56f629641206b971ae7f5d
Author : Eric Sandeen <sandeen@redhat.com>
Date : 2026-08-27T11:22:40-05:00
Stats : +10/-938 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/guilt/c/c3fcab8cb34b119f4d56f629641206b971ae7f5d?branch=rawhide
Log:
Rebase to upstream v0.37.1
---
diff --git a/.gitignore b/.gitignore
index eaf0b93..ebee5b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ guilt-0.33.tar.bz2
/guilt-0.34.tar.bz2
/guilt-0.35.tar.bz2
/guilt-0.36.tar.gz
+/v0.37.1.tar.gz
diff --git a/guilt-0.36-filter-dd.patch b/guilt-0.36-filter-dd.patch
deleted file mode 100644
index 9f0877d..0000000
--- a/guilt-0.36-filter-dd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: guilt-0.36/regression/scaffold
-===================================================================
---- guilt-0.36.orig/regression/scaffold
-+++ guilt-0.36/regression/scaffold
-@@ -42,9 +42,11 @@ function replace_path
- -e "\\,^Deleted branch guilt/.* (was .*).$,d"
- }
-
-+# Newer dd does
-+# (1.0 kB, 1.0 kiB) copied, ...
- function filter_dd
- {
-- sed -e 's:^\([0-9]*\) bytes (\([0-9]*\.[0-9]* .B\)) copied.*$:\1 bytes (\2) copied:'
-+ sed -e 's:^\([0-9]*\) bytes (\([0-9]*\.[0-9]* .B\).*) copied.*$:\1 bytes (\2) copied:'
- }
-
- # usage: cmd <cmd>..
diff --git a/guilt-0.36-fix-portability-problem-with-using-find-perm-111.patch b/guilt-0.36-fix-portability-problem-with-using-find-perm-111.patch
deleted file mode 100644
index 9612a68..0000000
--- a/guilt-0.36-fix-portability-problem-with-using-find-perm-111.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2bd00ac2e816a341723fa9209389dd9a246f8858 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Thu, 11 Aug 2016 09:48:27 -0400
-Subject: [PATCH] [PATCH] guilt: fix portability problem with using find -perm
- +111
-
-GNU find no longers accepts -perm +111, even though the rest of the
-world (MacOS, Solaris, BSD) still do. Workaround this problem by
-using -executable if the system find utility will accept it.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-[jeffpc: fixed typo in fallback predicate]
-Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
----
- guilt | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/guilt b/guilt
-index 35177b9..8209738 100755
---- a/guilt
-+++ b/guilt
-@@ -73,8 +73,17 @@ GUILT_PATH="$(dirname "$0")"
-
- guilt_commands()
- {
-- find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
-- find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/$GUILT-//"
-+ # GNU Find no longer accepts -perm +111, even though the rest
-+ # world (MacOS, Solaris, BSD, etc.) does. Sigh. Using -executable
-+ # is arugably better, but it is a GNU extension. Since this isn't
-+ # a fast path and guilt doesn't use autoconf, test for it as needed.
-+ if find . -maxdepth 0 -executable > /dev/null 2>&1 ; then
-+ exe_test="-executable"
-+ else
-+ exe_test="-perm +111"
-+ fi
-+ find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f $exe_test 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
-+ find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f $exe_test | sed -e "s/.*\\/$GUILT-//"
- }
-
- # by default, we shouldn't fail
---
-2.11.4.GIT
-
-
diff --git a/guilt-0.36-fix-regressions-newer-git.patch b/guilt-0.36-fix-regressions-newer-git.patch
deleted file mode 100644
index a2cd617..0000000
--- a/guilt-0.36-fix-regressions-newer-git.patch
+++ /dev/null
@@ -1,667 +0,0 @@
-diff --git a/regression/t-020.out b/regression/t-020.out
-index 5d7c918..59352c6 100644
---- a/regression/t-020.out
-+++ b/regression/t-020.out
-@@ -228,7 +228,6 @@ Invalid number of patches to push.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -243,7 +242,6 @@ Invalid number of patches to push.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -258,7 +256,6 @@ Patch is already applied.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -357,7 +354,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -478,7 +474,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch~
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-diff --git a/regression/t-021.out b/regression/t-021.out
-index 32dae17..c496a36 100644
---- a/regression/t-021.out
-+++ b/regression/t-021.out
-@@ -74,7 +74,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -158,7 +157,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -225,7 +223,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -364,7 +361,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-diff --git a/regression/t-025.out b/regression/t-025.out
-index 01bc406..3d13764 100644
---- a/regression/t-025.out
-+++ b/regression/t-025.out
-@@ -125,8 +125,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -149,8 +147,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -172,8 +168,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -195,8 +189,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -219,8 +211,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -243,8 +233,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -267,8 +255,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -291,8 +277,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -315,8 +299,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -339,8 +321,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -363,8 +343,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -387,8 +365,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -411,8 +387,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -435,8 +409,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -459,8 +431,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -483,8 +453,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -507,8 +475,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -531,8 +497,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -555,8 +519,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -579,8 +541,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -603,8 +563,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -627,8 +585,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -651,8 +607,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -675,8 +629,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -699,8 +651,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -723,8 +673,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -747,8 +695,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -771,8 +717,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -795,8 +739,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -836,8 +778,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 1ef04b4f4149870b3f06b5f99b9d9fc260cebc67 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -864,8 +804,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 06d2f9f2f2c01d41544a0eab8040959c318e8c3b .git/patches/master/uncommitted-changes
- f 0d14139c7f15f095b9a3dae9802f20072a4c1859 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
-@@ -914,8 +852,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 06d2f9f2f2c01d41544a0eab8040959c318e8c3b .git/patches/master/uncommitted-changes
- f 0d14139c7f15f095b9a3dae9802f20072a4c1859 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
-@@ -945,8 +881,6 @@ d .git/patches/master/dir
- d .git/patches/master/dir/subdir
- d .git/refs/patches
- d .git/refs/patches/master
--d .git/refs/patches/master/dir
--d .git/refs/patches/master/dir/subdir
- f 06d2f9f2f2c01d41544a0eab8040959c318e8c3b .git/patches/master/uncommitted-changes
- f 0fe110e08d3278d1c5757ee600c0a6c043f0cc07 .git/patches/master/status
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
-diff --git a/regression/t-026.out b/regression/t-026.out
-index be50b48..b3ff303 100644
---- a/regression/t-026.out
-+++ b/regression/t-026.out
-@@ -37,7 +37,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 7848194fd2e9ee0eb6589482900687d799d60a12 .git/patches/master/series
-diff --git a/regression/t-029.out b/regression/t-029.out
-index a8a49cc..c22e832 100644
---- a/regression/t-029.out
-+++ b/regression/t-029.out
-@@ -93,7 +93,6 @@ Repair complete.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -135,7 +134,6 @@ Repair complete.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-diff --git a/regression/t-030.out b/regression/t-030.out
-index 58bc50e..a1885fb 100644
---- a/regression/t-030.out
-+++ b/regression/t-030.out
-@@ -112,7 +112,6 @@ r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 3516b9a25ed0eb359d1920f62a59f093bb90f7dd .git/patches/master/series
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -124,7 +123,6 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 3516b9a25ed0eb359d1920f62a59f093bb90f7dd .git/patches/master/series
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-diff --git a/regression/t-035.out b/regression/t-035.out
-index cc16fb4..0712346 100644
---- a/regression/t-035.out
-+++ b/regression/t-035.out
-@@ -43,7 +43,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -97,7 +96,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
-@@ -153,7 +151,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
-@@ -211,7 +208,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
-@@ -272,7 +268,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
-@@ -332,7 +327,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~
-@@ -392,7 +386,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
-@@ -452,7 +445,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~
-diff --git a/regression/t-051.out b/regression/t-051.out
-index c750e92..736ab2a 100644
---- a/regression/t-051.out
-+++ b/regression/t-051.out
-@@ -117,7 +117,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -231,7 +230,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -340,7 +338,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 4a83e5a312b6e25e333400a5ebdf19a297a7ecfc .git/patches/master/series
-@@ -454,7 +451,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 4a83e5a312b6e25e333400a5ebdf19a297a7ecfc .git/patches/master/series
-@@ -565,7 +561,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 4a83e5a312b6e25e333400a5ebdf19a297a7ecfc .git/patches/master/series
-@@ -689,7 +684,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 03416e9c8dd788d6cb1b318d74ff34f4d6150c44 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -798,7 +792,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 03416e9c8dd788d6cb1b318d74ff34f4d6150c44 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -914,7 +907,6 @@ All patches popped.
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
- f 03416e9c8dd788d6cb1b318d74ff34f4d6150c44 .git/patches/master/series
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-diff --git a/regression/t-061.out b/regression/t-061.out
-index 60ad56d..2ca8ad8 100644
---- a/regression/t-061.out
-+++ b/regression/t-061.out
-@@ -215,8 +215,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -263,8 +261,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -281,8 +277,6 @@ d .git/patches
- d .git/patches/master
- d .git/patches/topic
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -310,8 +304,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -394,8 +386,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-diff --git a/regression/t-062.out b/regression/t-062.out
-index ad5c081..aebff23 100644
---- a/regression/t-062.out
-+++ b/regression/t-062.out
-@@ -181,8 +181,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -226,8 +224,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -244,8 +240,6 @@ d .git/patches
- d .git/patches/master
- d .git/patches/topic
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/topic/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
-@@ -273,8 +267,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
-@@ -354,8 +346,6 @@ d4850419ccc1146c7169f500725ce504b9774ed0 commit refs/heads/master
- d .git/patches
- d .git/patches/master
- d .git/refs/patches
--d .git/refs/patches/master
--d .git/refs/patches/topic
- f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
- f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
- f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
diff --git a/guilt-0.36-git-decorate.patch b/guilt-0.36-git-decorate.patch
deleted file mode 100644
index 812f223..0000000
--- a/guilt-0.36-git-decorate.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- guilt-0.36/regression/t-034.sh.orig 2015-08-28 11:04:33.890689798 -0500
-+++ guilt-0.36/regression/t-034.sh 2015-08-28 11:20:40.062063194 -0500
-@@ -67,7 +67,7 @@
-
- # If push and pop works, the names we created are good.
- cmd guilt push -a
--cmd git log --decorate
--cmd git log --decorate some-branch
-+cmd git log
-+cmd git log some-branch
- cmd list_files
- cmd guilt pop -a
---- guilt-0.36/regression/t-034.out.orig 2015-08-28 11:26:18.409136825 -0500
-+++ guilt-0.36/regression/t-034.out 2015-08-28 11:32:38.967249546 -0500
-@@ -306,148 +306,148 @@
- Patch applied.
- Applying patch..can-have-embedded-single-slashes.patch
- Patch applied.
--% git log --decorate
--commit 434e07cacdd8e7eb4723e67cb2d100b3a4121a3a (HEAD, refs/patches/master/can-have-embedded-single-slashes.patch, guilt/master)
-+% git log
-+commit 434e07cacdd8e7eb4723e67cb2d100b3a4121a3a
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Can/have/embedded/single/slashes
-
--commit 7c3ffa4f940c862e9f11f5d4a5ae421f7a8d3141 (refs/patches/master/backslash-is-forbidden.patch)
-+commit 7c3ffa4f940c862e9f11f5d4a5ae421f7a8d3141
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Backslash\is\forbidden.
-
--commit ea46f435d4d8f3c5349dce1aabc1a39fbf7ef803 (refs/patches/master/x.patch)
-+commit ea46f435d4d8f3c5349dce1aabc1a39fbf7ef803
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- @
-
--commit a275ed5d7f10ea88c986852ee95a7d5a61663b5f (refs/patches/master/cannot@have@the@sequence@at-brace.patch)
-+commit a275ed5d7f10ea88c986852ee95a7d5a61663b5f
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Cannot@{have@{the@{sequence@{at-brace.
-
--commit f091fee39457e64ebd35410c1cf95e6613816a54 (refs/patches/master/cannot_end_in_.patch)
-+commit f091fee39457e64ebd35410c1cf95e6613816a54
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Cannot end in ..
-
--commit 025672497aff5c910c8ff86aaedc662f14c2f4ad (refs/patches/master/cannot-end-in-slash-.patch)
-+commit 025672497aff5c910c8ff86aaedc662f14c2f4ad
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Cannot/end/in/slash/
-
--commit f13e243c7c56f39422567a431bccceec8b789596 (refs/patches/master/multiple-slashes--are--forbidden.patch)
-+commit f13e243c7c56f39422567a431bccceec8b789596
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Multiple/slashes//are//forbidden.
-
--commit edef5e925083d445f71c170d3293fac9619bc7a2 (refs/patches/master/openbracketisforbidden.patch)
-+commit edef5e925083d445f71c170d3293fac9619bc7a2
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Open[bracket[is[forbidden.
-
--commit 1626a11d979a1e9e775c766484172212277153df (refs/patches/master/asterisk-is-forbidden.patch)
-+commit 1626a11d979a1e9e775c766484172212277153df
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Asterisk*is*forbidden.
-
--commit 74df14ab3a0ec9a0382998fbf167ebb1b0a36c6a (refs/patches/master/question-mark-is-forbidden.patch)
-+commit 74df14ab3a0ec9a0382998fbf167ebb1b0a36c6a
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Question-mark?is?forbidden.
-
--commit ec46429125abdb0c5ac2b46cc399bdcd7cfc73fd (refs/patches/master/crisalsoforbidden.patch)
-+commit ec46429125abdb0c5ac2b46cc399bdcd7cfc73fd
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- CR\ris\ralso\rforbidden.
-
--commit 01524f9921af2a041cc88c068f76baa39e436cb2 (refs/patches/master/ctrlisforbidden.patch)
-+commit 01524f9921af2a041cc88c068f76baa39e436cb2
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Ctrl\x01is\x02forbidden.
-
--commit 9fc9677b61880f9159838e89f714893e0a2fcafb (refs/patches/master/delisforbidden.patch)
-+commit 9fc9677b61880f9159838e89f714893e0a2fcafb
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Del\x7fis\x7fforbidden.
-
--commit 10433fd7206b7f79aabb4da514710d93c8deed4a (refs/patches/master/colon_is_forbidden.patch)
-+commit 10433fd7206b7f79aabb4da514710d93c8deed4a
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Colon:is:forbidden.
-
--commit fb1edb753c97ec865ceea316420b1df586caaa2b (refs/patches/master/caretisforbidden.patch)
-+commit fb1edb753c97ec865ceea316420b1df586caaa2b
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Caret^is^forbidden.
-
--commit 3a0d5ccef0359004fcaa9cee98fbd6a2c4432e74 (refs/patches/master/tildeisforbidden.patch)
-+commit 3a0d5ccef0359004fcaa9cee98fbd6a2c4432e74
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Tilde~is~forbidden.
-
--commit ea22c3b49c448dba8d7eaa6b805f9f1bc83fbedc (refs/patches/master/space_is_forbidden.patch)
-+commit ea22c3b49c448dba8d7eaa6b805f9f1bc83fbedc
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Space is forbidden.
-
--commit db6ea8252440b04811344336f510a5469b2ddab0 (refs/patches/master/check-multiple-.-dots-.-foo.patch)
-+commit db6ea8252440b04811344336f510a5469b2ddab0
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Check/multiple/../dots/...../foo..patch
-
--commit fe07105cd62660f4440ad24b9fc7dfdd9e71d764 (refs/patches/master/two_consecutive_dots_(.)_is_forbidden.patch)
-+commit fe07105cd62660f4440ad24b9fc7dfdd9e71d764
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- Two consecutive dots (..) is forbidden.
-
--commit 96a3e92c4df85f52362ce4f6d31983c462db9ae9 (refs/patches/master/a-component-may-not-end-in-foolock.patch)
-+commit 96a3e92c4df85f52362ce4f6d31983c462db9ae9
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- A/component/may/not/end/in/foo.lock
-
--commit ee4f0f96dfc9c94f5410c1e6414f9004325a37fc (refs/patches/master/the_sequence_.lock-_is_forbidden.patch)
-+commit ee4f0f96dfc9c94f5410c1e6414f9004325a37fc
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- The sequence .lock/ is forbidden.
-
--commit fdcb23c3072209bea3d9e0a2594132b936c5347e (refs/patches/master/the_sequence_-._is_forbidden.patch)
-+commit fdcb23c3072209bea3d9e0a2594132b936c5347e
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- The sequence /. is forbidden.
-
--commit d4850419ccc1146c7169f500725ce504b9774ed0 (tag: base, master)
-+commit d4850419ccc1146c7169f500725ce504b9774ed0
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
- initial
-
- Signed-off-by: Commiter Name <commiter@email>
--% git log --decorate some-branch
--commit 589ee305a82aacf155529e75cbc84e661c37c83d (tag: some-tag, some-branch)
-+% git log some-branch
-+commit 589ee305a82aacf155529e75cbc84e661c37c83d
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
-@@ -507,7 +507,7 @@
-
- The sequence /. is forbidden.
-
--commit d4850419ccc1146c7169f500725ce504b9774ed0 (tag: base, master)
-+commit d4850419ccc1146c7169f500725ce504b9774ed0
- Author: Author Name <author@email>
- Date: Mon Jan 1 00:00:00 2007 +0000
-
diff --git a/guilt.spec b/guilt.spec
index 08a06e2..a85d1ff 100644
--- a/guilt.spec
+++ b/guilt.spec
@@ -1,23 +1,18 @@
Name: guilt
-Version: 0.36
-Release: 27%{?dist}
+Version: 0.37.1
+Release: 1%{?dist}
Summary: Scripts to manage quilt-like patches on top of git
# Automatically converted from old format: GPLv2 - review is highly recommended.
License: GPL-2.0-only
-URL: http://repo.or.cz/guilt.git
-Source: %{name}-%{version}.tar.gz
+URL: https://github.com/git-guilt
+Source: v%{version}.tar.gz
Requires: git, gawk, sed, bash
BuildArch: noarch
BuildRequires: asciidoc, xmlto, git-core
BuildRequires: make
-Patch0: guilt-0.36-git-decorate.patch
-Patch1: guilt-0.36-filter-dd.patch
-Patch2: guilt-0.36-fix-regressions-newer-git.patch
-Patch3: guilt-0.36-fix-portability-problem-with-using-find-perm-111.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
@@ -41,13 +36,16 @@ make install-doc PREFIX=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT/usr/share/man
make test
%files
-%doc COPYING Documentation/HOWTO Documentation/Contributing Documentation/Features
+%doc COPYING Documentation/HOWTO Documentation/Contributing.md Documentation/Features
%{_bindir}/guilt
%{_prefix}/lib/*
%{_mandir}/man1/guilt*.1*
%{_mandir}/man7/guilt*.7*
%changelog
+* Thu Aug 27 2026 Eric Sandeen <sandeen@redhat.com> - 0.37.1-1
+- Rebase to upstream; new project homepage on github
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.36-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 9c5e59b..bd7102c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-360b9d8354a7bb989c73a6f069146ccf guilt-0.36.tar.gz
+SHA512 (v0.37.1.tar.gz) = 59fc9228257ea14701617a0a634e27c29af437146b45126213d925d8c2d4b88f05db72ca858604b35d3232085329d96d27010a0c738c824947805e170fce27cb
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-27 16:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-27 16:23 [rpms/guilt] rawhide: Rebase to upstream v0.37.1 Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox