All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Lesh <eclesh@ucla.edu>
To: jsipek@cs.sunysb.edu
Cc: git <git@vger.kernel.org>
Subject: [PATCH guilt] guilt-fork: Rename patches sequentially (ala quilt)
Date: Tue, 27 Mar 2007 20:43:58 -0700	[thread overview]
Message-ID: <1175053438.5945.7.camel@localhost> (raw)

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

                 reply	other threads:[~2007-03-28  3:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1175053438.5945.7.camel@localhost \
    --to=eclesh@ucla.edu \
    --cc=git@vger.kernel.org \
    --cc=jsipek@cs.sunysb.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.