git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, j6t@kdbg.org
Subject: Re: [PATCH v4 9/9] Documentation: git stash branch now tolerates non-stash references.
Date: Sat, 14 Aug 2010 10:30:25 +1000	[thread overview]
Message-ID: <AANLkTi=U5HaHvXMjum3zpZgBRD68gPN=vk7f8iy7Q-VM@mail.gmail.com> (raw)
In-Reply-To: <7vr5i3mj4h.fsf@alter.siamese.dyndns.org>

On Fri, Aug 13, 2010 at 10:49 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Jon Seymour <jon.seymour@gmail.com> writes:
>
> Hmm.
>
> Is there anything that describes how <stash-like>, <stash-entry> and
> <stash> relate to each other?  I do not think a regular reader can answer
> by reading the description after the patch these questions:
>
>  - Is a <stash-entry> a <stash-like>?
>  - Is the opposite true?
>
> etc...
>
> Perhaps we can simply call these two-parent merge commits a <stash>,
> define that these commands as working on a <stash>, add notes to certain
> subcommands that the <stash> they take must be on the stash ref (as
> opposed to a freestanding one you can create with "stash create"), and be
> done with it?
>
> Also what is the error condition?  I am assuming that your <stash-entry>
> is a <stash-like> that is on the reflog of refs/stash, but if you give a
> <stash-like> that is not a <stash-entry> (iow a freestanding <stash>) to a
> subcommand that wants to see <stash-entry>, what happens, and does the
> document describe it as an error?
>
>> -pop [--index] [-q|--quiet] [<stash>]::
>> +pop [--index] [-q|--quiet] [<stash-entry>]::
>>
>>       Remove a single stashed state from the stash list and apply it
>>       on top of the current working tree state, i.e., do the inverse
>

Ok, I'll have another crack at it, and address the other issues you
have noted in another round.

Thanks for the review.

jon.

      reply	other threads:[~2010-08-14  0:30 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-08  4:46 [PATCH v3 0/9] stash: modifiy handling of stash-like references Jon Seymour
2010-08-08  4:46 ` [PATCH v3 1/9] stash: refactor - create pop_stash function Jon Seymour
2010-08-08  4:46 ` [PATCH v3 2/9] stash: extract stash-like check into its own function Jon Seymour
2010-08-08  4:46 ` [PATCH v3 3/9] stash: introduce is_stash_ref and assert_stash_ref functions Jon Seymour
2010-08-08  4:46 ` [PATCH v3 4/9] stash: teach git stash pop to fail early if the argument is not a stash ref Jon Seymour
2010-08-08  4:46 ` [PATCH v3 5/9] stash: teach git stash drop to fail early if the specified revision is not a stash reference Jon Seymour
2010-08-08  4:46 ` [PATCH v3 6/9] stash: teach git stash branch to tolerate stash-like arguments Jon Seymour
2010-08-08  4:46 ` [PATCH v3 7/9] stash: teach git stash show to always " Jon Seymour
2010-08-08  4:46 ` [PATCH v3 8/9] t3903-stash.sh: tests of git stash with " Jon Seymour
2010-08-08  9:32   ` Johannes Sixt
2010-08-08 12:56     ` Jon Seymour
2010-08-08  4:46 ` [PATCH v3 9/9] Documentation: git stash branch now tolerates non-stash references Jon Seymour
2010-08-08 13:18   ` Jon Seymour
2010-08-10  0:04 ` [PATCH v4 0/9] stash: modifiy handling of stash-like references Jon Seymour
2010-08-10  0:04 ` [PATCH v4 1/9] stash: refactor - create pop_stash function Jon Seymour
2010-08-10  0:04 ` [PATCH v4 2/9] stash: extract stash-like check into its own function Jon Seymour
2010-08-13  0:49   ` Junio C Hamano
2010-08-13 23:55     ` Jon Seymour
2010-08-10  0:04 ` [PATCH v4 3/9] stash: introduce is_stash_ref and assert_stash_ref functions Jon Seymour
2010-08-13  0:49   ` Junio C Hamano
2010-08-14  0:26     ` Jon Seymour
2010-08-10  0:04 ` [PATCH v4 4/9] stash: teach git stash pop to fail early if the argument is not a stash ref Jon Seymour
2010-08-10  0:04 ` [PATCH v4 5/9] stash: teach git stash drop to fail early if the specified revision is not a stash reference Jon Seymour
2010-08-10  0:04 ` [PATCH v4 6/9] stash: teach git stash branch to tolerate stash-like arguments Jon Seymour
2010-08-10  0:04 ` [PATCH v4 7/9] stash: teach git stash show to always " Jon Seymour
2010-08-13  0:49   ` Junio C Hamano
2010-08-10  0:04 ` [PATCH v4 8/9] t3903-stash.sh: tests of git stash with " Jon Seymour
2010-08-10  0:04 ` [PATCH v4 9/9] Documentation: git stash branch now tolerates non-stash references Jon Seymour
2010-08-13  0:49   ` Junio C Hamano
2010-08-14  0:30     ` Jon Seymour [this message]

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='AANLkTi=U5HaHvXMjum3zpZgBRD68gPN=vk7f8iy7Q-VM@mail.gmail.com' \
    --to=jon.seymour@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    /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).