Re: 'pu' branch for StGIT

From: Pavel Roskin <proski@gnu.org>
Date: Aug 8, 2007, 22:18 UTC
Message-ID: <1186611514.7383.4.camel@dv>
In-Reply-To: <20070808213917.GA22521@diana.vm.bytemark.co.uk>

Hello, Karl!

On Wed, 2007-08-08 at 23:39 +0200, Karl Hasselström wrote:

> > Hmm, I hadn't noticed. That would be an unintended side-effect of
> > the DAG patches, presumably. I'll look into it tonight.
> 
> I can't reproduce.

OK, it's trickier. There are some bad patch names that don't get imported properly. In particular, patches ending with ".diff" are committed after import.

Try changing this in the testsuite:

diff --git a/t/t1800-import.sh b/t/t1800-import.sh
index 8c8c9a0..6cd3cdb 100755
--- a/t/t1800-import.sh
+++ b/t/t1800-import.sh
@@ -15,7 +15,7 @@ test_expect_success \
 test_expect_success \
     'Apply a patch created with "git diff"' \
     '
-    stg import ../t1800-import/git-diff &&
+    stg import -n git.diff ../t1800-import/git-diff &&
     [ $(git cat-file -p $(stg id) \
         | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
     stg delete ..

And now run the test

$ ./t1800-import.sh -i -v
...
Importing patch "git.diff" ... done
No patches applied

The mainline StGIT is OK.

-- 
Regards,
Pavel Roskin