From: Junio C Hamano <gitster@pobox.com>
To: "Σταύρος Ντέντος" <stdedos@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Fwd: Bug in `git add -N xyz ; git stash` command
Date: Wed, 16 Dec 2020 11:17:18 -0800 [thread overview]
Message-ID: <xmqq1rfp4l35.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAHMHMxW_zwq_xK3Mh5QjC4dM1muVotESZdGQkRAx8xeKYmHzbw@mail.gmail.com> ("Σταύρος Ντέντος"'s message of "Wed, 16 Dec 2020 12:48:04 +0200")
Σταύρος Ντέντος <stdedos@gmail.com> writes:
> I think I have found a bug with the following series of commands:
>
> $ git add -N xyz ; git stash
> error: Entry 'xyz' not uptodate. Cannot merge.
> Cannot save the current worktree state
>
> It has bothered me that `git add -N xyz` "is not obvious that it is
> done", unless you know that you did it - and now it seems that there
> is some buggy behavior about that.
Hmph, is this the same issue as what we discussed in
https://lore.kernel.org/git/CA+dzEBmh4LdN-XFS9y9YKrDMzV_7+QpDzBA2uv9Xi80PgR5NTQ@mail.gmail.com/
I wonder.
next prev parent reply other threads:[~2020-12-16 19:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAHMHMxW-LwjLWF9PPuSJmbAafw37d_18j+HmOd4+8MKbajb_8A@mail.gmail.com>
2020-12-16 10:48 ` Fwd: Bug in `git add -N xyz ; git stash` command Σταύρος Ντέντος
2020-12-16 19:17 ` Junio C Hamano [this message]
2020-12-17 8:43 ` Σταύρος Ντέντος
2020-12-17 19:42 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1rfp4l35.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=stdedos@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).