-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git-cms-addpkg resets staged (but not yet commited) changes without a warning. #57
Comments
I've accidentally misclicked and closed, reopening. |
I can confirm the issue. @ktf , maybe we can wrap the git-cms-addpkg internals with a git stash ? git stash save --keep-index --include-untracked "prepare for git cms-addpkg" ? |
I don't think stashing is a good solution and it just might cause complex bugs in the future. A simple check would be enough, quick-n-dirty: Note: read-tree already fails with unmerged files. |
Hey, M. |
I have nothing against stashing except that it adds complexity to the wrapper script. My solution is just to check for staged files, without doing any damage. Additionally, this bug might appear outside the situation I've described. I've seen it |
I've added the simple check to both git-cms-addpkg and git-cms-merge-topic in #65 . |
Okay, thanks. |
Hi,
If you do git-cms-addpkg, all staged (but not yet committed) changes will be reset without a warning.
Dmitrijus
The text was updated successfully, but these errors were encountered: