From: Junio C Hamano <gitster@pobox.com>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: git@vger.kernel.org, j6t@kdbg.org
Subject: Re: [PATCH v4 2/9] stash: extract stash-like check into its own function
Date: Thu, 12 Aug 2010 17:49:28 -0700 [thread overview]
Message-ID: <7v8w4bnxpj.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1281398688-21008-3-git-send-email-jon.seymour@gmail.com
Jon Seymour <jon.seymour@gmail.com> writes:
> A similar code block is used in three places; this change
> factors the stash-like check into a separate function so that
> it can be used in these and other places.
"git stash show" used to be able to show a single-parent commit, and we
are forbidding that "feature". I'd actually call that a bugfix though ;-)
> +# if this function returns, then:
> +# s is set to the stash commit
> +# w_commit is set to the commit containing the working tree
> +# b_commit is set to the base commit
> +# i_commit is set to the commit containing the index tree
> +# otherwise:
> +# the function exits via die
> +#
> +assert_stash_like() {
> + # stash records the work tree, and is a merge between the
> + # base commit (first parent) and the index tree (second parent).
> + s=$(git rev-parse --revs-only --quiet --verify --default $ref_stash "$@") &&
> + w_commit=$(git rev-parse --quiet --verify "$s:") &&
> + b_commit=$(git rev-parse --quiet --verify "$s^1:") &&
> + i_commit=$(git rev-parse --quiet --verify "$s^2:") ||
> + die "$*: no valid stashed state found"
Don't these "rev-parse" calls return tree objects? It is too confusing to
call them x_commit if that is the case.
next prev parent reply other threads:[~2010-08-13 0:49 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 [this message]
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
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=7v8w4bnxpj.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jon.seymour@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).