From: Erik Faye-Lund Date: Sun, 29 Mar 2009 20:05:36 GMT Subject: Re: [PATCH 1/4] test-suite: adding a test for fast-export with tag variants Message-ID: <40aa078e0903291305p28ec2ae8xf0cb465e593af0b0@mail.gmail.com> In-Reply-To: <1237812789-1360-1-git-send-email-kusmabite@gmail.com> OK, I see now that the previous patch-series has been merged to "pu". Is there a reason why this updated patch-series hasn't superseded it? Did I do something wrong when I resubmitted it? And what do I need to do to get these patches going forward from there? On Mon, Mar 23, 2009 at 2:53 PM, Erik Faye-Lund wrote: > The first two new tests are crashing, so I'm adding them commented out as they > exit with unpredictable return-codes. > > Signed-off-by: Erik Faye-Lund > --- >  t/t9301-fast-export.sh |   14 +++++++++++++- >  1 files changed, 13 insertions(+), 1 deletions(-) > > diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh > index 86c3760..db4b0b3 100755 > --- a/t/t9301-fast-export.sh > +++ b/t/t9301-fast-export.sh > @@ -28,7 +28,12 @@ test_expect_success 'setup' ' >        git commit -m sitzt file2 && >        test_tick && >        git tag -a -m valentin muss && > -       git merge -s ours master > +       git merge -s ours master && > +       HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` && > +       git tag    tree_tag        -m "tagging a tree" $HEAD_TREE && > +       git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE && > +       git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj && > +       git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj > >  ' > > @@ -259,4 +264,11 @@ test_expect_success 'cope with tagger-less tags' ' > >  ' > > +# NEEDSWORK: not just check return status, but validate the output > +# two tests commented out due to crash and thus unreliable return code > +#test_expect_success 'tree_tag'        'git fast-export tree_tag' > +#test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj' > +test_expect_failure 'tag-obj_tag'     'git fast-export tag-obj_tag' > +test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' > + >  test_done > -- > 1.6.2.1.225.g9a4a0.dirty > > -- Erik "kusma" Faye-Lund kusmabite@gmail.com (+47) 986 59 656