git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org, Alban Gruin <alban.gruin@gmail.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 3/3] rebase (autostash): use an explicit OID to apply the stash
Date: Tue, 23 Oct 2018 13:13:00 +0900	[thread overview]
Message-ID: <xmqqzhv5s3lf.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181022223256.GI30222@szeder.dev> ("SZEDER Gábor"'s message of "Tue, 23 Oct 2018 00:32:56 +0200")

SZEDER Gábor <szeder.dev@gmail.com> writes:

>> To prevent that from happening, let's append `^0` after the stash hash,
>> to make sure that it is interpreted as an OID rather than as a number.
>
> Oh, this is clever.

Yeah, we can do this as we know we'd be dealing with a commit-ish.
If we made a mistake to use a tree object to represent a stash, this
trick wouldn't have been possible ;-)

> FWIW, all patches look good to me, barring the typo below.
> ...
>> +	/* Ensure that the hash is not mistake for a number */
>
> s/mistake/mistaken/

Will squash this in and add your reviewed-by before queuing.

Thanks, both.

  reply	other threads:[~2018-10-23  4:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <pull.52.git.gitgitgadget@gmail.com>
2018-10-22 22:15 ` [PATCH v2 0/3] Fix rebase autostash Johannes Schindelin via GitGitGadget
2018-10-22 22:15   ` [PATCH v2 1/3] rebase (autostash): avoid duplicate call to state_dir_path() Johannes Schindelin via GitGitGadget
2018-10-22 22:15   ` [PATCH v2 2/3] rebase (autostash): store the full OID in <state-dir>/autostash Johannes Schindelin via GitGitGadget
2018-10-22 22:15   ` [PATCH v2 3/3] rebase (autostash): use an explicit OID to apply the stash Johannes Schindelin via GitGitGadget
2018-10-22 22:25     ` Eric Sunshine
2018-10-22 22:32     ` SZEDER Gábor
2018-10-23  4:13       ` Junio C Hamano [this message]
2018-10-23  9:34         ` Johannes Schindelin
2018-10-23 17:07     ` Alban Gruin

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=xmqqzhv5s3lf.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=alban.gruin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=szeder.dev@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).