git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: John Nowak <john@johnnowak.com>
Cc: git@vger.kernel.org
Subject: Re: reproducible unexpected behavior for 'git reset'
Date: Mon, 11 Jul 2011 14:54:43 -0700	[thread overview]
Message-ID: <7vwrfoa3fg.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <75BBC138-2BD7-41F9-9D84-CEFF23CDC235@johnnowak.com> (John Nowak's message of "Sun, 10 Jul 2011 18:30:31 -0400")

John Nowak <john@johnnowak.com> writes:

> I am able to reproduce a scenario where, after a 'commit' and a 'stash
> pop' that results in a merge conflict, I need to 'reset' a file twice in
> order to get the index back to HEAD.

Thanks, you found a bug in "git reset [<commit>] -- path" codepath, it
seems, when dealing with an unmerged path.

  reply	other threads:[~2011-07-11 21:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-10 22:30 reproducible unexpected behavior for 'git reset' John Nowak
2011-07-11 21:54 ` Junio C Hamano [this message]
2011-07-11 22:41   ` Junio C Hamano
2011-07-14  6:01     ` Junio C Hamano
2011-07-19 18:13       ` [PATCH 0/2] refactoring diff-index Junio C Hamano
2011-07-19 18:13         ` [PATCH 1/2] diff-lib: simplify do_diff_cache() Junio C Hamano
2011-07-19 20:14           ` Jeff King
2011-07-19 21:28             ` Junio C Hamano
2011-07-19 18:13         ` [PATCH 2/2] diff-lib: refactor run_diff_index() and do_diff_cache() Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2011-07-10 22:02 reproducible unexpected behavior for 'git reset' John Nowak

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=7vwrfoa3fg.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=john@johnnowak.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).