Re: [PATCH] git stash: Avoid data loss when saving a stash
Hi!
On Fri, Jun 28, 2013 at 11:39:16AM -0700, Junio C Hamano wrote:
> Thanks. I'll queue it with a pair of fix-up commits on top, so that
> they can later be squashed in.
>
> The result of squashing the fix-ups would look like this.
Thanks! I agree with all of your changes.
> -- >8 --
> From: Petr Baudis <pasky@ucw.cz>
> Date: Fri, 28 Jun 2013 17:05:32 +0200
> Subject: [PATCH] git stash: avoid data loss when "git stash save" kills a directory
Hmm, it's a pity that the note that `git reset --hard` itself should
perhaps also abort in that case got lost. I don't insist on mentioning
it in the commit message, though.
On Fri, Jun 28, 2013 at 02:30:15PM -0700, Junio C Hamano wrote:
> -- >8 --
> Subject: treat_directory(): do not declare submodules in index to be untracked
Oh, you are truly awesome! I admit that properly reviewing this patch
is a little out of my depth right now as I'm not familiar with this
infrastructure. I'd just like to note...
Show 5 quoted lines
> case index_gitdir:
> if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
> return path_none;
> - return path_untracked;
> + return path_none;
...that the if-test can be removed now as both branches are the same.
Petr "Pasky" Baudis
Petr Baudis <pasky@ucw.cz>