git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 11/12] t5524: test --log=1 limits shortlog length

From
Junio C Hamano <gitster@pobox.com>
Date
May 7, 2015, 17:28 UTC
Message-ID
<xmqqbnhwqoue.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1430988248-18285-12-git-send-email-pyokagan@gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 6 quoted lines
> While git-pull supports --log and passes the switch to git-merge, it
> does not support --log=<n>, ignoring the value <n>.
>
> This is not only at odds with the documentation of git-pull, it's also a
> undesirable limitation as <n> could simply be passed to git-merge as
> well.

A cleaner alternative may be to fix that while git-pull is still a script, as you seem to already know what is broken and what in the current code needs to be fixed in what way exactly. Perhaps do that at the earlier part of (or even as an independent patch outside) this series and add this test to protect the fix from getting broken later (with expect-failure flipped to expect-success)?

Thanks.
>
> Implement a failing test that demonstrates this.
Show 43 quoted lines
>
> Signed-off-by: Paul Tan <pyokagan@gmail.com>
> ---
>
> Notes:
>     * Added this test to the patch series
>
>  t/t5524-pull-msg.sh | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
> index 8cccecc..5b7af07 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' '
> +(
> +	cd cloned &&
> +	git reset --hard HEAD^ &&
> +	test `cat afile` = original &&
> +	test `cat bfile` = added &&
> +	git pull --log &&
> +	git log -3 &&
> +	git cat-file commit HEAD >result &&
> +	grep Dollar result &&
> +	! grep "second commit" result
> +)
> +'
> +
>  test_done
Previous: Junio C HamanoNext: Paul Tan
Message 46 of 49 in “Improve git-pull test coverage”
  1. 00/12 Improve git-pull test coveragePaul Tan, May 7, 2015
  2. 01/12 t5520: implement tests for no merge candidates casesPaul Tan, May 7, 2015
  3. Torsten BögershausenMay 7, 2015
  4. Junio C HamanoMay 7, 2015
  5. Paul TanMay 7, 2015
  6. Junio C HamanoMay 7, 2015
  7. Torsten BögershausenMay 7, 2015
  8. 02/12 t5520: test for failure if index has unresolved entriesPaul Tan, May 7, 2015
  9. Eric SunshineMay 7, 2015
  10. Paul TanMay 12, 2015
  11. 03/12 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 7, 2015
  12. Stefan BellerMay 7, 2015
  13. Junio C HamanoMay 7, 2015
  14. Paul TanMay 7, 2015
  15. 04/12 t5520: test --rebase with multiple branchesPaul Tan, May 7, 2015
  16. 05/12 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 7, 2015
  17. Stefan BellerMay 7, 2015
  18. Paul TanMay 7, 2015
  19. Eric SunshineMay 7, 2015
  20. 06/12 t5521: test --dry-run does not make any changesPaul Tan, May 7, 2015
  21. 07/12 t4013: call git-merge instead of git-pullPaul Tan, May 7, 2015
  22. Johannes SchindelinMay 7, 2015
  23. Paul TanMay 7, 2015
  24. Johannes SchindelinMay 8, 2015
  25. Junio C HamanoMay 7, 2015
  26. 08/12 t5520: ensure origin refs are updatedPaul Tan, May 7, 2015
  27. 09/12 t7406: use "git pull" instead of "git pull --rebase"Paul Tan, May 7, 2015
  28. Junio C HamanoMay 7, 2015
  29. Paul TanMay 7, 2015
  30. Junio C HamanoMay 7, 2015
  31. Paul TanMay 10, 2015
  32. 10/12 t5520: failing test for pull --all with no configured upstreamPaul Tan, May 7, 2015
  33. Junio C HamanoMay 7, 2015
  34. Paul TanMay 7, 2015
  35. Junio C HamanoMay 7, 2015
  36. Paul TanMay 9, 2015
  37. 11/12 t5524: test --log=1 limits shortlog lengthPaul Tan, May 7, 2015
  38. Johannes SchindelinMay 7, 2015
  39. Paul TanMay 7, 2015
  40. Johannes SixtMay 7, 2015
  41. Johannes SchindelinMay 8, 2015
  42. Thomas GummererMay 8, 2015
  43. Johannes SchindelinMay 8, 2015
  44. Johannes SixtMay 8, 2015
  45. Junio C HamanoMay 8, 2015
  46. Junio C HamanoMay 7, 2015
  47. 12/12 t5520: check reflog action in fast-forward mergePaul Tan, May 7, 2015
  48. Stefan BellerMay 7, 2015
  49. Junio C HamanoMay 7, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.