Is there a cleaner way to handle “git stash apply”?
I'm having problems with recovering changes from a stashed and untracked file in git. See minimal example below:
mkdir test_stash
cd test_stash/
git init
echo "text" | tee a.txt b.txt
git add a.txt
git commit -m "First commit"
git stash -u #stash b.txt
echo "newtext" > b.txt
git add b.txt
git commit -m "Second commit"
git stash apply
This returns me an error:
b.txt already exists, no checkout
Could not restore untracked files from stash entry
The example alone is a bit silly, but I ran into this problem when stashing changes before pulling from remote and then finding out that a new file had been created on remote with the same name.
After some googling I was able to recover the changes with:
git checkout stash -- .
git checkout stash^3 -- .
git reset HEAD . #to unstage
but this seems quite hacky. Isn't there a way to force my git stash apply, thus bringing my workspace to the original state before the stash? The changes on b.txt are already committed anyway, so it's not like I would risk losing unsaved changes.
git
asked Jan 3 at 15:39
vbsvbs
63
add a comment |
I'm having problems with recovering changes from a stashed and untracked file in git. See minimal example below:
mkdir test_stash
cd test_stash/
git init
echo "text" | tee a.txt b.txt
git add a.txt
git commit -m "First commit"
git stash -u #stash b.txt
echo "newtext" > b.txt
git add b.txt
git commit -m "Second commit"
git stash apply
This returns me an error:
b.txt already exists, no checkout
Could not restore untracked files from stash entry
The example alone is a bit silly, but I ran into this problem when stashing changes before pulling from remote and then finding out that a new file had been created on remote with the same name.
After some googling I was able to recover the changes with:
git checkout stash -- .
git checkout stash^3 -- .
git reset HEAD . #to unstage
but this seems quite hacky. Isn't there a way to force my git stash apply, thus bringing my workspace to the original state before the stash? The changes on b.txt are already committed anyway, so it's not like I would risk losing unsaved changes.
git
asked Jan 3 at 15:39
vbsvbs
63
add a comment |
I'm having problems with recovering changes from a stashed and untracked file in git. See minimal example below:
mkdir test_stash
cd test_stash/
git init
echo "text" | tee a.txt b.txt
git add a.txt
git commit -m "First commit"
git stash -u #stash b.txt
echo "newtext" > b.txt
git add b.txt
git commit -m "Second commit"
git stash apply
This returns me an error:
b.txt already exists, no checkout
Could not restore untracked files from stash entry
The example alone is a bit silly, but I ran into this problem when stashing changes before pulling from remote and then finding out that a new file had been created on remote with the same name.
After some googling I was able to recover the changes with:
git checkout stash -- .
git checkout stash^3 -- .
git reset HEAD . #to unstage
but this seems quite hacky. Isn't there a way to force my git stash apply, thus bringing my workspace to the original state before the stash? The changes on b.txt are already committed anyway, so it's not like I would risk losing unsaved changes.
git
asked Jan 3 at 15:39
vbsvbs
63
I'm having problems with recovering changes from a stashed and untracked file in git. See minimal example below:
mkdir test_stash
cd test_stash/
git init
echo "text" | tee a.txt b.txt
git add a.txt
git commit -m "First commit"
git stash -u #stash b.txt
echo "newtext" > b.txt
git add b.txt
git commit -m "Second commit"
git stash apply
This returns me an error:
b.txt already exists, no checkout
Could not restore untracked files from stash entry
The example alone is a bit silly, but I ran into this problem when stashing changes before pulling from remote and then finding out that a new file had been created on remote with the same name.
After some googling I was able to recover the changes with:
git checkout stash -- .
git checkout stash^3 -- .
git reset HEAD . #to unstage
but this seems quite hacky. Isn't there a way to force my git stash apply, thus bringing my workspace to the original state before the stash? The changes on b.txt are already committed anyway, so it's not like I would risk losing unsaved changes.
git
git
asked Jan 3 at 15:39
vbsvbs
63
asked Jan 3 at 15:39
vbsvbs
63
edited Jan 4 at 11:19
vbs
asked Jan 3 at 15:39
vbsvbs
63
asked Jan 3 at 15:39
vbsvbs
63
asked Jan 3 at 15:39
vbsvbs
63
63
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
When you save a stash git also remembers the commit. So you can simply create a new branch based on this commit with git stash branch <branchname> instead of applying the stash.
answered Jan 5 at 7:19
StefanStefan
1715
add a comment |
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "3"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fsuperuser.com%2fquestions%2f1390215%2fis-there-a-cleaner-way-to-handle-git-stash-apply%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
When you save a stash git also remembers the commit. So you can simply create a new branch based on this commit with git stash branch <branchname> instead of applying the stash.
answered Jan 5 at 7:19
StefanStefan
1715
add a comment |
When you save a stash git also remembers the commit. So you can simply create a new branch based on this commit with git stash branch <branchname> instead of applying the stash.
answered Jan 5 at 7:19
StefanStefan
1715
add a comment |
When you save a stash git also remembers the commit. So you can simply create a new branch based on this commit with git stash branch <branchname> instead of applying the stash.
answered Jan 5 at 7:19
StefanStefan
1715
When you save a stash git also remembers the commit. So you can simply create a new branch based on this commit with git stash branch <branchname> instead of applying the stash.
answered Jan 5 at 7:19
StefanStefan
1715
answered Jan 5 at 7:19
StefanStefan
1715
answered Jan 5 at 7:19
StefanStefan
1715
answered Jan 5 at 7:19
StefanStefan
1715
1715
add a comment |
add a comment |
Thanks for contributing an answer to Super User!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fsuperuser.com%2fquestions%2f1390215%2fis-there-a-cleaner-way-to-handle-git-stash-apply%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
