* [PATCH guilt] guilt-fork: Rename patches sequentially (ala quilt)
@ 2007-03-28 3:43 Eric Lesh
0 siblings, 0 replies; only message in thread
From: Eric Lesh @ 2007-03-28 3:43 UTC (permalink / raw)
To: jsipek; +Cc: git
From: Eric Lesh <eclesh@ucla.edu>
Date: Tue, 27 Mar 2007 20:18:10 -0700
Subject: [PATCH] guilt-fork: Rename patches sequentially (ala quilt)
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
---
guilt-fork | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/guilt-fork b/guilt-fork
index 4ab55d7..ae31739 100755
--- a/guilt-fork
+++ b/guilt-fork
@@ -19,8 +19,12 @@ if ! must_commit_first; then
die "Uncommited changes detected. Refresh first."
fi
-# FIXME: Be smarter about the new patchname (ala what quilt does)
-newpatch="$patch-2"
+# Rename patches smartly
+base=$(echo "$patch" \
+ | sed -r -e 's:(\.diff?|\.patch)$::')
+num=$(echo "$base" | sed -nre 's:.*-([0-9]+)$:\1:'p)
+[ -n "$num" ] || num=1
+newpatch="${base%-$num}-$((num+1))${patch#$base}"
# copy the patch
cp "$GUILT_DIR/$branch/$patch" "$GUILT_DIR/$branch/$newpatch"
--
1.5.1-rc1.GIT
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-03-28 3:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-28 3:43 [PATCH guilt] guilt-fork: Rename patches sequentially (ala quilt) Eric Lesh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.