Signed-off-by: David Kågedal <davidk@xxxxxxxxxxxxxx> --- t/t0002-status.sh | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/t/t0002-status.sh b/t/t0002-status.sh index ce3b688..790b9fb 100755 --- a/t/t0002-status.sh +++ b/t/t0002-status.sh @@ -85,6 +85,12 @@ test_expect_success 'Status after refresh' ' diff -u expected.txt output.txt ' +test_expect_success 'Add another file' ' + echo lajbans > fie && + stg add fie && + stg refresh +' + test_expect_success 'Make a conflicting patch' ' stg pop && stg new -m "third patch" && @@ -105,6 +111,28 @@ test_expect_success 'Status after conflicting push' ' ' cat > expected.txt <<EOF +C foo/bar +EOF +test_expect_success 'Status of file' ' + stg status foo/bar > output.txt && + diff -u expected.txt output.txt +' + +cat > expected.txt <<EOF +EOF +test_expect_success 'Status of dir' ' + stg status foo > output.txt && + diff -u expected.txt output.txt +' + +cat > expected.txt <<EOF +EOF +test_expect_success 'Status of other file' ' + stg status fie > output.txt && + diff -u expected.txt output.txt +' + +cat > expected.txt <<EOF M foo/bar EOF test_expect_success 'Status after resolving the push' ' - 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