From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2022 19:52:57 +0000 (-0800)
Subject: Merge branch 'en/stash-df-fix'
X-Git-Tag: v2.35.0-rc0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e223455917954f414cea98b00b67aac91e2b619;p=thirdparty%2Fgit.git

Merge branch 'en/stash-df-fix'

"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
---

6e223455917954f414cea98b00b67aac91e2b619