git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 4/6] Test the new DAG appliedness machinery
Date: Sun, 10 Jun 2007 02:55:16 -0700	[thread overview]
Message-ID: <20070610095516.12000.1553.stgit@bill> (raw)
In-Reply-To: <20070610094322.12000.56284.stgit@bill>



Signed-off-by: Karl Hasselström <kha@treskal.com>
---

 t/t3000-git-interop.sh |   60 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/t/t3000-git-interop.sh b/t/t3000-git-interop.sh
new file mode 100755
index 0000000..44414b9
--- /dev/null
+++ b/t/t3000-git-interop.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+# Copyright (c) 2007 Karl Hasselström
+test_description='Test git/StGIT interoperability'
+. ./test-lib.sh
+
+test_expect_success \
+    'Create some git-only history' '
+    echo foo > foo.txt &&
+    git add foo.txt &&
+    git commit -a -m foo &&
+    git tag foo-tag &&
+    for i in 0 1 2 3 4; do
+        echo foo$i >> foo.txt &&
+        git commit -a -m foo$i;
+    done
+'
+
+test_expect_success \
+    'Initialize the StGIT repository' '
+    stg init
+'
+
+test_expect_success \
+    'Create five patches' '
+    for i in 0 1 2 3 4; do
+        stg new p$i -m p$i;
+    done &&
+    [ "$(echo $(stg applied))" = "p0 p1 p2 p3 p4" ] &&
+    [ "$(echo $(stg unapplied))" = "" ]
+'
+
+test_expect_success \
+    'Pop two patches with git-reset' '
+    git reset --hard HEAD~2 &&
+    [ "$(echo $(stg applied))" = "p0 p1 p2" ] &&
+    [ "$(echo $(stg unapplied))" = "p3 p4" ]
+'
+
+test_expect_success \
+    'Create a new patch' '
+    stg new q0 -m q0 &&
+    [ "$(echo $(stg applied))" = "p0 p1 p2 q0" ] &&
+    [ "$(echo $(stg unapplied))" = "p3 p4" ]
+'
+
+test_expect_success \
+    'Go to an unapplied patch with with git-reset' '
+    git reset --hard $(stg id p3) &&
+    [ "$(echo $(stg applied))" = "p0 p1 p2 p3" ] &&
+    [ "$(echo $(stg unapplied))" = "q0 p4" ]
+'
+
+test_expect_success \
+    'Go back to below the stack base with git-reset' '
+    git reset --hard foo-tag &&
+    [ "$(echo $(stg applied))" = "" ] &&
+    [ "$(echo $(stg unapplied))" = "p0 p1 p2 q0 p3 p4" ]
+'
+
+test_done

  parent reply	other threads:[~2007-06-10  9:55 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-06 15:13 [StGIT PATCH] Don't use patches/<branch>/current Karl Hasselström
2007-05-15 15:56 ` Catalin Marinas
2007-05-15 16:21   ` Peter Oberndorfer
2007-05-15 16:50     ` Catalin Marinas
2007-05-15 18:25   ` Karl Hasselström
2007-05-15 19:38     ` [StGIT PATCH] Remove obsolete files when deleting a branch Karl Hasselström
2007-05-15 20:01     ` [StGIT PATCH] Don't use patches/<branch>/current Catalin Marinas
2007-05-16  7:11       ` Karl Hasselström
2007-05-16 12:07         ` Catalin Marinas
2007-05-16 19:40           ` Karl Hasselström
2007-05-16 20:40             ` Karl Hasselström
2007-05-17 12:43               ` Catalin Marinas
2007-05-17 14:57                 ` Karl Hasselström
2007-05-17 20:51                   ` Catalin Marinas
2007-05-18  6:30                     ` Karl Hasselström
2007-06-10  9:54                       ` [StGIT PATCH 0/6] New and improved DAG appliedness series Karl Hasselström
2007-06-10  9:54                         ` [StGIT PATCH 1/6] Verify patch status during the test Karl Hasselström
2007-06-10  9:55                         ` [StGIT PATCH 2/6] Make use of the get_patch() utility function Karl Hasselström
2007-06-10  9:55                         ` [StGIT PATCH 3/6] Compute patch appliedness from commit DAG Karl Hasselström
2007-06-10  9:55                         ` Karl Hasselström [this message]
2007-06-10  9:55                         ` [StGIT PATCH 5/6] Fix bash completion after the DAG appliedness patch Karl Hasselström
2007-06-10  9:55                         ` [StGIT PATCH 6/6] Speed up the appliedness test Karl Hasselström
2007-06-30 19:54                         ` [StGIT PATCH 0/6] New and improved DAG appliedness series Yann Dirson
2007-07-01 14:35                           ` Karl Hasselström
2007-05-15 21:08   ` [StGIT PATCH] Don't use patches/<branch>/current Yann Dirson
2007-05-15 21:36     ` Catalin Marinas
2007-05-15 21:49       ` Yann Dirson
2007-05-16  6:27         ` Karl Hasselström
2007-05-19  0:09           ` [StGIT PATCH 0/5] Metadata format versioning Karl Hasselström
2007-05-19  0:09             ` [StGIT PATCH 1/5] Fix config caching so that get, set, get works Karl Hasselström
2007-05-19  0:09             ` [StGIT PATCH 2/5] Have only a single command in each test_expect_failure Karl Hasselström
2007-05-19  0:10             ` [StGIT PATCH 3/5] Upgrade old StGIT branches to new-format metadata Karl Hasselström
2007-05-19  0:10             ` [StGIT PATCH 4/5] Test the format version upgrade code Karl Hasselström
2007-05-19  0:10             ` [StGIT PATCH 5/5] Add --binary flag to commands that generate diffs Karl Hasselström
2007-05-22 12:15               ` Catalin Marinas
2007-05-22 13:31                 ` Karl Hasselström
2007-05-20 20:03 ` [StGit PATCH 0/2] Bash prompt updates Robin Rosenberg
2007-05-20 20:04   ` [StGit PATCH 1/2] Update the bash prompt from 'applied' instead of the obsolete 'current' Robin Rosenberg
2007-05-20 20:46     ` Yann Dirson
2007-05-20 21:22       ` [PATCH " Robin Rosenberg
2007-05-21  7:48         ` Karl Hasselström
2007-05-21  9:31           ` Catalin Marinas
2007-05-21 10:15             ` Karl Hasselström
2007-05-21 11:39               ` Karl Hasselström
2007-05-21 15:17                 ` Catalin Marinas
2007-05-21 15:39                   ` Karl Hasselström
2007-05-22 12:11                     ` Catalin Marinas
2007-05-22 13:29                       ` Karl Hasselström
2007-05-21 18:57             ` Yann Dirson
2007-05-20 21:24       ` [PATCH 2/2] Don't use / as separatar since it is common i branch names Robin Rosenberg
2007-05-20 20:04   ` [StGit PATCH " Robin Rosenberg

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=20070610095516.12000.1553.stgit@bill \
    --to=kha@treskal.com \
    --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).