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@xxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
