Re: [PATCH 4/8] contrib/subtree: Code cleaning and refactoring

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 18, 2013, 22:55 UTC
Message-ID: <7vy5el8c6b.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1361221013-12756-5-git-send-email-greened@obbligato.org>

"David A. Greene" <greened@obbligato.org> writes:

Show 7 quoted lines

> 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 &&

Show 13 quoted lines

>  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?)