From: Junio C Hamano <gitster@pobox.com>
To: "David A. Greene" <greened@obbligato.org>
Cc: git@vger.kernel.org, Techlive Zheng <techlivezheng@gmail.com>,
James Nylen <jnylen@gmail.com>
Subject: Re: [PATCH 4/8] contrib/subtree: Code cleaning and refactoring
Date: Mon, 18 Feb 2013 14:55:24 -0800 [thread overview]
Message-ID: <7vy5el8c6b.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1361221013-12756-5-git-send-email-greened@obbligato.org> (David A. Greene's message of "Mon, 18 Feb 2013 14:56:49 -0600")
"David A. Greene" <greened@obbligato.org> writes:
> From: Techlive Zheng <techlivezheng@gmail.com>
>
> Mostly prepare for the later tests refactoring.
>
> Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
> Signed-off-by: David A. Greene <greened@obbligato.org>
> ---
Applying: contrib/subtree: Code cleaning and refactoring
/srv/project/git/git.git/.git/rebase-apply/patch:219: space before tab in indent.
git branch spl1 "$spl1" &&
/srv/project/git/git.git/.git/rebase-apply/patch:222: space before tab in indent.
undo
/srv/project/git/git.git/.git/rebase-apply/patch:239: space before tab in indent.
undo &&
/srv/project/git/git.git/.git/rebase-apply/patch:269: space before tab in indent.
git subtree split --unannotate="subproj:" --prefix subdir --onto FETCH_HEAD --branch splitunann &&
> contrib/subtree/t/t7900-subtree.sh | 256 +++++++++++++++++++-----------------
> 1 file changed, 136 insertions(+), 120 deletions(-)
>
> diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
> index c7f9e1a..3787408 100755
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -4,7 +4,7 @@
> #
> test_description='Basic porcelain support for subtrees
>
> -This test verifies the basic operation of the merge, pull, add
> +This test verifies the basic operation of the add, pull, merge
Why this change? The new list does not match the order of things
that are tested ("add" is not the first thing that gets tested), it
is not alphabetical either ("pull" sorts earlier than "merge"), nor
it is the natural progression of operation users would expect (it
would be more like "add" to start working with subtree, then "merge"
locally and finally "pull" to interact with others, no?)
next prev parent reply other threads:[~2013-02-18 22:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 20:56 Subtree Fixes Updates David A. Greene
2013-02-18 20:56 ` [PATCH 1/8] contrib/subtree: Use %B for split subject/body David A. Greene
2013-02-18 22:43 ` Junio C Hamano
2013-02-18 20:56 ` [PATCH 2/8] contrib/subtree: Fix whitespaces David A. Greene
2013-02-18 20:56 ` [PATCH 3/8] contrib/subtree: Ignore testing directory David A. Greene
2013-02-18 22:51 ` Junio C Hamano
2013-02-18 20:56 ` [PATCH 4/8] contrib/subtree: Code cleaning and refactoring David A. Greene
2013-02-18 22:55 ` Junio C Hamano [this message]
2013-02-18 20:56 ` [PATCH 5/8] contrib/subtree: Make each test self-contained David A. Greene
2013-02-18 20:56 ` [PATCH 6/8] contrib/subtree: Handle '--prefix' argument with a slash appended David A. Greene
2013-02-18 20:56 ` [PATCH 7/8] contrib/subtree: Remove --annotate David A. Greene
2013-02-18 20:56 ` [PATCH 8/8] Remove test artifaces from clean rule David A. Greene
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy5el8c6b.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=greened@obbligato.org \
--cc=jnylen@gmail.com \
--cc=techlivezheng@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.
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 NNTP newsgroup(s).