From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH] Document shortcoming of stg-k and stg-unnew.
Date: Wed, 04 Jul 2007 21:18:47 +0200 [thread overview]
Message-ID: <20070704191846.15788.35842.stgit@gandelf.nowhere.earth> (raw)
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
contrib/stg-k | 8 +++++---
contrib/stg-unnew | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/contrib/stg-k b/contrib/stg-k
index 0134c25..62211be 100755
--- a/contrib/stg-k
+++ b/contrib/stg-k
@@ -8,11 +8,13 @@ set -e
# essence, "stg-k pop" is a "stg pop -k" that works better, hence its
# name.
-# CAVEAT: this script relies on the operation to run ignoring hidden
+# CAVEATS:
+# - this script relies on the operation to run ignoring hidden
# patches, so in 0.12 (where "stg push" can push an hidden patch)
# "stg-k push" will fail midway, albeit with no information loss -
-# you'll just have to finish manually. Luckilly this appears to work
-# on master branch.
+# you'll just have to finish manually. This is fixed in 0.13
+# - running this script to pop all patches in the stack fails, since
+# stg-unnew does not support this case.
# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
# Subject to the GNU GPL, version 2.
diff --git a/contrib/stg-unnew b/contrib/stg-unnew
index 5ac8781..2a38264 100755
--- a/contrib/stg-unnew
+++ b/contrib/stg-unnew
@@ -6,6 +6,9 @@ set -e
# Remove the current patch from the stack, keeping its contents as
# uncommitted changes.
+# CAVEAT: running this script on the bottom-most patch fails, since
+# "stg pick --fold" does not allow this situation.
+
# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
# Subject to the GNU GPL, version 2.
reply other threads:[~2007-07-04 19:19 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=20070704191846.15788.35842.stgit@gandelf.nowhere.earth \
--to=ydirson@altern.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).