From: Paul Tan <pyokagan@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Paul Tan <pyokagan@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH v2] pull: handle --log=<n>
Date: Mon, 18 May 2015 23:15:36 +0800 [thread overview]
Message-ID: <CACRoPnQKge+3gCnO79yTZHxyPE=XgCONApWPF7Ue7DSxr0E7Og@mail.gmail.com> (raw)
In-Reply-To: <1431956396-21788-1-git-send-email-pyokagan@gmail.com>
Just a mental note to myself,
On Mon, May 18, 2015 at 9:39 PM, Paul Tan <pyokagan@gmail.com> wrote:
> diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
> index 8cccecc..eebb8c9 100755
> --- a/t/t5524-pull-msg.sh
> +++ b/t/t5524-pull-msg.sh
> @@ -17,6 +17,9 @@ test_expect_success setup '
> git commit -m "add bfile"
> ) &&
> test_tick && test_tick &&
> + echo "second" >afile &&
> + git add afile &&
> + git commit -m "second commit" &&
> echo "original $dollar" >afile &&
> git add afile &&
> git commit -m "do not clobber $dollar signs"
> @@ -32,4 +35,18 @@ test_expect_success pull '
> )
> '
>
> +test_expect_failure '--log=1 limits shortlog length' '
Ugh ><
s/test_expect_failure/test_expect_success/
Will respond to the other reviews tomorrow (it's bedtime in SGT).
> +(
> + cd cloned &&
> + git reset --hard HEAD^ &&
> + test "$(cat afile)" = original &&
> + test "$(cat bfile)" = added &&
> + git pull --log=1 &&
> + git log -3 &&
> + git cat-file commit HEAD >result &&
> + grep Dollar result &&
> + ! grep "second commit" result
> +)
> +'
> +
> test_done
> --
> 2.1.4
Thanks,
Paul
next prev parent reply other threads:[~2015-05-18 15:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 13:39 [PATCH v2] pull: handle --log=<n> Paul Tan
2015-05-18 14:53 ` Johannes Schindelin
2015-05-18 18:18 ` Junio C Hamano
2015-05-19 13:35 ` Johannes Schindelin
2015-05-19 13:57 ` Junio C Hamano
2015-05-19 21:24 ` Dennis Kaarsemaker
2015-05-19 21:33 ` Stefan Beller
2015-05-19 21:43 ` Dennis Kaarsemaker
2015-05-19 21:37 ` Junio C Hamano
2015-05-19 21:49 ` Dennis Kaarsemaker
2015-05-19 22:10 ` Junio C Hamano
2015-05-19 22:30 ` Dennis Kaarsemaker
2015-05-19 23:14 ` Junio C Hamano
2015-05-20 2:19 ` Junio C Hamano
2015-05-20 8:11 ` Dennis Kaarsemaker
2015-05-20 5:10 ` Junio C Hamano
2015-05-20 8:13 ` Dennis Kaarsemaker
2015-05-21 10:36 ` [PATCH v3] " Paul Tan
2015-05-21 21:24 ` Junio C Hamano
2015-05-22 13:29 ` Paul Tan
2015-05-18 15:15 ` Paul Tan [this message]
2015-05-18 15:26 ` [PATCH v2] " Johannes Schindelin
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='CACRoPnQKge+3gCnO79yTZHxyPE=XgCONApWPF7Ue7DSxr0E7Og@mail.gmail.com' \
--to=pyokagan@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.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).