From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org, Jon Smirl <jonsmirl@gmail.com>
Subject: [StGit PATCH] Test that we can add a new file to a non-topmost patch with refresh -p
Date: Fri, 18 Jul 2008 19:03:06 +0200 [thread overview]
Message-ID: <20080718170225.10086.17504.stgit@yoghurt> (raw)
In-Reply-To: <20080718084127.GA7042@diana.vm.bytemark.co.uk>
We currently can't -- this is bug 12038, found by Jon Smirl. See
https://gna.org/bugs/index.php?12038
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
Here's a proper test that demonstrates the bug. It applies to the
stable branch.
t/t2701-refresh-p.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
create mode 100755 t/t2701-refresh-p.sh
diff --git a/t/t2701-refresh-p.sh b/t/t2701-refresh-p.sh
new file mode 100755
index 0000000..d42e90f
--- /dev/null
+++ b/t/t2701-refresh-p.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+test_description='Run "stg refresh -p"'
+
+. ./test-lib.sh
+
+# Ignore our own temp files.
+cat >> .git/info/exclude <<EOF
+expected*.txt
+files*.txt
+status*.txt
+EOF
+
+test_expect_success 'Initialize StGit stack' '
+ stg init &&
+ for i in 1 2; do
+ echo x > $i.txt &&
+ git add $i.txt &&
+ stg new p$i -m "Patch $i" &&
+ stg refresh
+ done
+'
+
+touch expected0.txt
+cat > expected1.txt <<EOF
+A 1.txt
+A new.txt
+EOF
+cat > expected2.txt <<EOF
+A 2.txt
+EOF
+test_expect_failure 'Add new file to non-top patch' '
+ stg status > status1.txt &&
+ diff -u expected0.txt status1.txt &&
+ echo y > new.txt &&
+ git add new.txt &&
+ stg refresh -p p1 &&
+ stg status > status2.txt &&
+ diff -u expected0.txt status2.txt &&
+ stg files p1 > files1.txt &&
+ diff -u expected1.txt files1.txt &&
+ stg files p2 > files2.txt &&
+ diff -u expected2.txt files2.txt
+'
+
+test_done
next prev parent reply other threads:[~2008-07-18 17:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-18 1:29 stgit: bug with refresh and -p Jon Smirl
2008-07-18 8:41 ` Karl Hasselström
2008-07-18 17:03 ` Karl Hasselström [this message]
2008-07-18 18:01 ` [StGit PATCH] Test that we can add a new file to a non-topmost patch with refresh -p Karl Hasselström
2008-07-18 17:45 ` Jon Smirl
2008-07-18 19:16 ` Karl Hasselström
2008-07-21 22:01 ` Catalin Marinas
2008-07-22 7:14 ` Karl Hasselström
2008-07-25 21:37 ` Catalin Marinas
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=20080718170225.10086.17504.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonsmirl@gmail.com \
/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).