On 23/08/07, Greg KH wrote: > I wanted to see if I could start using stgit instead of quilt, so I > tried to import my current set of kernel patches. > > After giving up on the "import a series" option, Why? > I just created a mbox > of all of them using quilt and tried to import that. Unfortunately that > didn't work either: > $ stg import -M ~/linux/patches/mbox > Checking for changes in the working directory ... done > Importing patch "add-my-version-to-the-kernel" ... done > Importing patch "stupid-patch-for-my-laptop-whi" ... done > Importing patch "gregs-test-driver-core-sysfs-s" ... done > Importing patch "detect-atomic-counter-underflo" ... done > Warning: Message does not contain any diff > stg import: No diff found inside the patch Maybe I should just leave the warning and let it continue. The reason I added it was that "git-apply --index" fails if there is no diff. In the meantime, you can try the attached patch for StGIT. Another hint - quilt can apply patches with fuzz but GIT doesn't allow this by default. If a patch fails, the diff is dumped to the .stgit-failed.patch file so that you can apply it manually (with patch or git-apply) and run 'stg refresh' afterwards. After an import failure, you can continue importing from the next patch using the 'stg import --ignore' option. > I'm using the .13 version if that matters. > > The mbox contains 177 kernel patches against Linus's current tree > (2.6.23-rc3-git5), and is available at: > http://www.kernel.org/pub/linux/kernel/people/gregkh/misc/gregkh-stgit-import-mbox.gz > if anyone wants to test it out and see what I was doing wrong. I'll give it a try. One thing you'll notice is the speed difference as stgit has to generate a git commit during a push operation. > Oh, I do have some suggestions as to the naming of the patch from a mail > file, as limiting this to a small number of characters like stgit > currently does will not work out for a lot of my patches, but I'll wait > until I can actually import the thing before I look into that :) We had the full name in the past but the algorithm cause problems with patches (not e-mails) that didn't have a subject line. It's probably better to have a config option rather than hard-coded 30 characters. Note that 'stg series -d' will display the full subject line. If you don't give up before importing the files :-), please let us know the user experience, especially related to speed as compared to quilt. Karl, maybe it's worth trying this series with your DAG patches as well. Regards. -- Catalin