Re: [PATCH 1/8] contrib/subtree: Use %B for split subject/body
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 18, 2013, 22:43 UTC
- Message-ID
- <7va9r19raq.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1361221013-12756-2-git-send-email-greened@obbligato.org>
"David A. Greene" <greened@obbligato.org> writes:
Show 10 quoted lines
> From: Techlive Zheng <techlivezheng@gmail.com> > > Use %B to format the commit message and body to avoid an extra newline > if a commit only has a subject line. > > Signed-off-by: Techlive Zheng <techlivezheng@gmail.com> > Signed-off-by: David A. Greene <greened@obbligato.org> > --- > contrib/subtree/t/t7900-subtree.sh | 11 +++++++++++ > 1 file changed, 11 insertions(+)
Huh?
This seems to be a repeat of the test added in a5b8e28e4eb5 (contrib/subtree: use %B for split subject/body, 2013-02-04) and nothing else, excluding the actual change to git-subtree itself.
Confused....
Show 23 quoted lines
> > diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh > index 80d3399..8dd6a82 100755 > --- a/contrib/subtree/t/t7900-subtree.sh > +++ b/contrib/subtree/t/t7900-subtree.sh > @@ -226,6 +226,17 @@ test_expect_success 'check hash of split' ' > check_equal ''"$new_hash"'' "$subdir_hash" > ' > > +test_expect_success 'check hash of split' ' > + spl1=$(git subtree split --prefix subdir) && > + undo && > + git subtree split --prefix subdir --branch splitbr1test && > + check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" > + git checkout splitbr1test && > + new_hash=$(git rev-parse HEAD~2) && > + git checkout mainline && > + check_equal ''"$new_hash"'' "$subdir_hash" > +' > + > test_expect_success 'check split with --branch for an existing branch' ' > spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' && > undo &&