From: Pavel Roskin <proski@gnu.org>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org, Catalin Marinas <catalin.marinas@gmail.com>,
Yann Dirson <ydirson@altern.org>
Subject: Re: 'pu' branch for StGIT
Date: Wed, 08 Aug 2007 18:18:34 -0400 [thread overview]
Message-ID: <1186611514.7383.4.camel@dv> (raw)
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
next prev parent reply other threads:[~2007-08-08 22:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-07 2:20 'pu' branch for StGIT Karl Hasselström
2007-08-07 2:38 ` Shawn O. Pearce
2007-08-08 5:03 ` Pavel Roskin
2007-08-08 9:20 ` Karl Hasselström
2007-08-08 21:39 ` Karl Hasselström
2007-08-08 22:18 ` Pavel Roskin [this message]
2007-08-08 23:23 ` Karl Hasselström
2007-08-09 0:10 ` Pavel Roskin
2007-08-09 7:38 ` Karl Hasselström
2007-08-09 13:24 ` Pavel Roskin
2007-08-09 14:18 ` Karl Hasselström
2007-08-09 14:24 ` Karl Hasselström
2007-08-09 16:33 ` Pavel Roskin
2007-08-09 20:39 ` Karl Hasselström
2007-08-10 3:23 ` [StGIT PATCH 0/2] Teach StGIT to survive git-gc Karl Hasselström
2007-08-10 3:23 ` [StGIT PATCH 1/2] New test: make sure that StGIT can handle packed refs Karl Hasselström
2007-08-10 3:23 ` [StGIT PATCH 2/2] Don't touch ref files manually Karl Hasselström
2007-08-21 13:23 ` Catalin Marinas
2007-08-21 15:58 ` Karl Hasselström
2007-08-21 16:09 ` Karl Hasselström
2007-08-21 16:12 ` Johannes Sixt
2007-08-21 16:38 ` Karl Hasselström
2007-08-21 16:46 ` Karl Hasselström
2007-08-21 20:48 ` Karl Hasselström
2007-08-23 14:04 ` Catalin Marinas
2007-08-09 21:31 ` 'pu' branch for StGIT Catalin Marinas
2007-08-10 0:30 ` Karl Hasselström
2007-08-12 22:47 ` Pavel Roskin
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=1186611514.7383.4.camel@dv \
--to=proski@gnu.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=ydirson@altern.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.