From: Hiroshige Umino <hiroshige88@gmail.com>
To: gitster@pobox.com
Cc: trast@inf.ethz.ch, hiroshige88@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH] cherry-pick: allow "-" as abbreviation of '@{-1}'
Date: Sat, 17 Aug 2013 00:17:37 +0900 (JST) [thread overview]
Message-ID: <20130817.001737.1890599379619259228.xxx@gmail.com> (raw)
In-Reply-To: <7vmwowm7bc.fsf@alter.siamese.dyndns.org> <87wqo33v4f.fsf@hexa.v.cablecom.net>
Junio C Hamano <gitster@pobox.com> wrote:
> Thomas Rast <trast@inf.ethz.ch> writes:
>
>> Hiroshige Umino <hiroshige88@gmail.com> writes:
>>
>>> As "git cherry-pick -" or "git merge -" is convenient to
>>> switch back to or merge the previous branch,
>>> "git cherry-pick -" is abbreviation of "git cherry-pick @{-1}"
>>> to pick up a commit from the previous branch conveniently.
>>
>> The first line is confusing. Did you mean to invoke the existing 'git
>> *checkout* -' and 'git merge -' functionality as a reason why 'git
>> cherry-pick -' should exist?
>
> I think that is what was meant. Just like "-" abbreviation is handy
> for users of "checkout" and "merge", "cherry-pick" might.
Yes I meant so and it would be useful at least for me.
I don't know the usage of cherry-pick (pick up a commit from the previous
branch) is comon or not but it may be also good for consistency.
Thomas Rast <trast@inf.ethz.ch> wrote:
> What other commands could reasonably use the '-' shorthand?
I've wanted '-' shorthand only for commit, merge and cherry-pick
but 'git diff -' may make sense.
What do you think of this and other candidates?
> Do you have to use a new test file for this?
Not have to so I'm moving the tests into t/t3500-cherry.sh.
> [...]
>> +test_expect_success 'setup' '
>> + echo hello >world &&
>> + git add world &&
> (*)
>> + git commit -m initial &&
>> + git branch other &&
>> + echo "hello again" >>world &&
>> + git add world &&
> (*)
>> + git commit -m second
>> +'
>
> Our style is to indent the test snippets with a hard tab, not a single
> (or eight, for that matter) space.
>
> [...]
>> +test_expect_success 'cherry-pick the commit in the previous branch' '
>> + prev=$(git rev-parse HEAD) &&
>> + git checkout other &&
> (*)
>> + git cherry-pick - &&
>> + test "z$(git rev-parse HEAD)" = "z$prev"
>> +'
>
> If you insert 'test_tick' in the places marked with (*), the test fails.
>
> The tests run under a fake clock to ensure that everything, including
> the SHA1s produced, are deterministic. You never advance the clock, so
> all commits generated in this script share the same timestamp.
>
> This means that the cherry-pick of 'second' has the same SHA1 as the
> original: its tree, parents, author, timestamp etc. all agree. If you
> advance the clock at the last (*), this fails. You should find some
> other way of checking what was picked, e.g., by looking at the file
> contents.
>
> That said, please use test_commit in the 'setup' snippet instead of
> manually rolling the commits. It will lead to shorter code, and it
> handles test_tick for you. It is documented in t/README and in a
> comment in t/test-lib-functions.sh. (You still need test_tick
> immediately before the cherry-pick!)
I overlooked t/README, thank you for kindly guiding testing!
--
Hiroshige UMINO @yaotti
prev parent reply other threads:[~2013-08-16 15:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 5:15 [PATCH] cherry-pick: allow "-" as abbreviation of '@{-1}' Hiroshige Umino
2013-08-03 10:51 ` Thomas Rast
2013-08-05 16:27 ` Junio C Hamano
2013-08-16 15:17 ` Hiroshige Umino [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=20130817.001737.1890599379619259228.xxx@gmail.com \
--to=hiroshige88@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@inf.ethz.ch \
/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).