Anyone else having problems with the po/ directory and git operations.
Grant Olson
kgo at grant-olson.net
Tue Mar 22 01:00:36 CET 2011
Git hasn't been letting me switch branches easily or rebase because of
some files in the po/ directory I just can't clean up. I've tried
running a clean checkout, and even deleting the files in question, but
git keeps complaining that I've got unstaged changes.
Is anyone else seeing this?
grant at johnyaya:~/src/gnupg$ git branch
STABLE-BRANCH-2-0
grant-2-0
master
master-grant
* master_grant
grant at johnyaya:~/src/gnupg$ git rebase -i master
po/de.po: needs update
po/tr.po: needs update
po/zh_CN.po: needs update
po/zh_TW.po: needs update
Working tree is dirty
grant at johnyaya:~/src/gnupg$ git stash
Saved working directory and index state WIP on master_grant: b9bcc77
Make use of gcry_kdf_derive.
HEAD is now at b9bcc77 Make use of gcry_kdf_derive.
grant at johnyaya:~/src/gnupg$ git rebase -i master
po/tr.po: needs update
po/zh_CN.po: needs update
po/zh_TW.po: needs update
Working tree is dirty
grant at johnyaya:~/src/gnupg$ git checkout -f
grant at johnyaya:~/src/gnupg$ git rebase -i master
po/tr.po: needs update
po/zh_CN.po: needs update
po/zh_TW.po: needs update
Working tree is dirty
grant at johnyaya:~/src/gnupg$
--
-Grant
"Look around! Can you construct some sort of rudimentary lathe?"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 564 bytes
Desc: OpenPGP digital signature
URL: </pipermail/attachments/20110321/b165f454/attachment.pgp>
More information about the Gnupg-devel
mailing list