Comments (7)
I've accidentally misclicked and closed, reopening.
from cms-git-tools.
I can confirm the issue.
@ktf , maybe we can wrap the git-cms-addpkg internals with a git stash ?
I.e. something like
git stash save --keep-index --include-untracked "prepare for git cms-addpkg"
...do whatever git cms-addpkg was doing
git stash pop stash@{0}
?
from cms-git-tools.
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:
[[ -z $(git status --porcelain) ]] || exit 1
Note: read-tree already fails with unmerged files.
from cms-git-tools.
Hey,
I just jumped into the very same problem and I'd vote for the stash solution. @dmitrijus what are the drawbacks of this approach you see?
M.
from cms-git-tools.
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.
I believe developers who are hit by this bug will know how to resolve this issue.
Additionally, this bug might appear outside the situation I've described. I've seen it
while doing merging and/or rebasing (if you have a conflict, git puts already merged files into staging).
I am not sure if you can stash unfinished merges/rebases correctly, I don't know git that well.
from cms-git-tools.
I've added the simple check to both git-cms-addpkg and git-cms-merge-topic in #65 .
from cms-git-tools.
Okay, thanks.
from cms-git-tools.
Related Issues (20)
- git-cms-addpkg and new packages HOT 1
- Check if a package exists before doing the read-tree HOT 2
- Add -p / --project option to specify repository. HOT 3
- cms-addpkg fails if $CMSSW_BASE/src is not empty HOT 2
- cms-addpkg doesn't recognize CMSSW_6_1_X_SLHC branch HOT 2
- Error when not creating the reference repository. HOT 1
- Using --https option fails when creating the reference repository.
- make addpackage check the current dir is inside of CMSSW_BASE HOT 3
- user.github vs github.user in gitconfig HOT 2
- how to choose another location for the reference repository? HOT 10
- git cms-addpkg gives unclear error message when package not found HOT 2
- "You don't seem to have a personal repository," when I do have a personal repository HOT 7
- please create a "public" OAuth API key HOT 6
- Add conflict resolution options to git-cms-merge-topic.
- Do not use /dev/stdout or stderr, running under sudo fails with permission errors. HOT 7
- Add a --continue feature to the cms-merge-topic HOT 2
- git cms-remote HOT 3
- Testing PRs from non cms-sw/cmssw repositories HOT 2
- git-cms-checkdeps does not create poison files for files which are renamed HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from cms-git-tools.