# [StGit] Import file(s) problem 4 messages from 2008-11-27 to 2008-11-28. Participants: Shinya Kuribayashi, Catalin Marinas, Karl Hasselström. Thread: https://gitlist.dev/t/16501 ## Shinya Kuribayashi, 2008-11-27 16:08 Subject: [StGit] Import file(s) problem Message-ID: <492EC5F5.2050807@ruby.dti.ne.jp> URL: https://gitlist.dev/e/492EC5F5.2050807%40ruby.dti.ne.jp ``` Hi Catalin and Karl, Today I encountered a problem when importing a patch. I don't know this is a known issue or not. If there are good workarounds for this, I'd like to know that. Any comments are appreciated. Steps to reproduce ------------------- 1. Prepare a patch, say stg-test.patch 2. Rename it to have '..' extension $ mv stg-test.patch stg-test..patch 3. Import it $ stg import /path/to/stg-test..patch You can see a lot of errors. See the log below. 4. At this point, just few stg operations are available. I had to switch to an other branch, then force deleting the corrupted branch to return to the original state. Note ----- The same goes to stg import -m [e-mail file]. So this seems to be trigged due to the wrong '..' extension. Log ---- skuribay@ubuntu:~/kernel/stgit.git$ (modify some file(s)) skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg diff >> ../stg-test.patch skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg status --reset skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg branch --create foo Checking for changes in the working directory ... done Recording as a local branch Branch "foo" created skuribay@ubuntu:~/kernel/stgit.git$ cd ../ skuribay@ubuntu:~/kernel$ skuribay@ubuntu:~/kernel$ mv stg-test.patch stg-test..patch skuribay@ubuntu:~/kernel$ skuribay@ubuntu:~/kernel$ cd - /home/skuribay/kernel/stgit.git skuribay@ubuntu:~/kernel/stgit.git$ stg import ../stg-test..patch Checking for changes in the working directory ... done fatal: Cannot lock the ref 'refs/patches/foo/stg-test..patch'. Traceback (most recent call last): File "/home/skuribay/bin/stg", line 43, in main() File "home/skuribay/lib/python2.5/site-packages/stgit/main.py", line 175, in main File "home/skuribay/lib/python2.5/site-packages/stgit/main.py", line 154, in _main File "home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py", line 482, in write_log File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 372, in compat_log_entry File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 322, in log_entry File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in from_stack File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 157, in get File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 486, in __getitem__ File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 147, in create_patch File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 26, in commit File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 449, in get KeyError: 'refs/patches/foo/stg-test..patch' skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg diff Error: Unhandled exception: Traceback (most recent call last): File "home/skuribay/lib/python2.5/site-packages/stgit/main.py", line 142, in _main File "home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py", line 491, in setup File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 524, in compat_log_external_mods File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 511, in log_external_mods File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 322, in log_entry File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in from_stack File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 157, in get File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 486, in __getitem__ File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 147, in create_patch File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 26, in commit File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 449, in get KeyError: 'refs/patches/foo/stg-test..patch' skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg series > stg-test..patch skuribay@ubuntu:~/kernel/stgit.git$ stg branch master Error: Unhandled exception: Traceback (most recent call last): File "home/skuribay/lib/python2.5/site-packages/stgit/main.py", line 142, in _main File "home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py", line 501, in setup File "home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py", line 495, in setup File "home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py", line 491, in setup File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 524, in compat_log_external_mods File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 511, in log_external_mods File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 322, in log_entry File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in from_stack File "home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py", line 179, in File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 157, in get File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 486, in __getitem__ File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 147, in create_patch File "home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py", line 26, in commit File "home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py", line 449, in get KeyError: 'refs/patches/foo/stg-test..patch' skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ git checkout master Switched to branch "master" skuribay@ubuntu:~/kernel/stgit.git$ stg branch -l Available branches: s foo | > s master | skuribay@ubuntu:~/kernel/stgit.git$ stg branch --delete foo Deleting branch "foo" ... stg branch: Cannot delete: the series still contains patches skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg branch --delete --force foo Deleting branch "foo" ... Warning: refs/patches/foo/stg-test..patch does not exist done skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg branch -l Available branches: > s master | skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ rm -f ../stg-test..patch skuribay@ubuntu:~/kernel/stgit.git$ skuribay@ubuntu:~/kernel/stgit.git$ stg version Stacked GIT 0.14.3.285.g62874 git version 1.5.4.3 Python version 2.5.2 (r252:60911, Jul 31 2008, 17:28:52) [GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)] skuribay@ubuntu:~/kernel/stgit.git$ Thanks, Shinya ``` ## Catalin Marinas, 2008-11-27 22:06 Subject: Re: [StGit] Import file(s) problem Message-ID: URL: https://gitlist.dev/e/b0943d9e0811271406u6768f45csdb5ae775436404b8%40mail.gmail.com In-Reply-To: <492EC5F5.2050807@ruby.dti.ne.jp> ``` 2008/11/27 Shinya Kuribayashi : > Today I encountered a problem when importing a patch. I don't know this > is a known issue or not. If there are good workarounds for this, I'd > like to know that. Any comments are appreciated. > > > Steps to reproduce > ------------------- > > 1. Prepare a patch, say stg-test.patch > > 2. Rename it to have '..' extension The '..' construct has special meaning in both Git and StGit meaning an interval of commits or patches. We'll need to reject patch names with '..' to avoid such errors. -- Catalin ``` ## Karl Hasselström, 2008-11-28 09:25 Subject: Re: [StGit] Import file(s) problem Message-ID: <20081128092556.GA4380@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20081128092556.GA4380%40diana.vm.bytemark.co.uk In-Reply-To: ``` On 2008-11-27 22:06:01 +0000, Catalin Marinas wrote: > The '..' construct has special meaning in both Git and StGit meaning > an interval of commits or patches. We'll need to reject patch names > with '..' to avoid such errors. I added a note to the bug database: https://gna.org/bugs/index.php?10919 -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle ``` ## Shinya Kuribayashi, 2008-11-28 15:31 Subject: Re: [StGit] Import file(s) problem Message-ID: <49300ECB.5090401@ruby.dti.ne.jp> URL: https://gitlist.dev/e/49300ECB.5090401%40ruby.dti.ne.jp In-Reply-To: <20081128092556.GA4380@diana.vm.bytemark.co.uk> ``` Karl Hasselström wrote: > On 2008-11-27 22:06:01 +0000, Catalin Marinas wrote: > >> The '..' construct has special meaning in both Git and StGit meaning >> an interval of commits or patches. We'll need to reject patch names >> with '..' to avoid such errors. > > I added a note to the bug database: > > https://gna.org/bugs/index.php?10919 Looking forward to being fixed, thanks. Shinya ```