]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27a70fa 71cade5)
Merge branch 'en/stash-df-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:57 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:57 +0000 (11:52 -0800)
"git stash apply" forgot to attempt restoring untracked files when
it failed to restore changes to tracked ones.

* en/stash-df-fix:
  stash: do not return before restoring untracked files

1  2 
builtin/stash.c patch | diff1 | diff2 | blob | history
t/t3903-stash.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/stash.c
Simple merge
diff --cc t/t3903-stash.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.