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

Re: [PATCH 07/13] contrib/subtree: Fix whitespaces

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 5, 2013, 04:42 UTC
Message-ID
<7v6227xtf1.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1360037173-23291-8-git-send-email-greened@obbligato.org>
"David A. Greene" <greened@obbligato.org> writes:
Show 7 quoted lines
> From: Techlive Zheng <techlivezheng@gmail.com>
>
> Previous code does not fulfill Git's whitespace policy.
>
> Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
> Signed-off-by: David A. Greene <greened@obbligato.org>
> ---

This does not seem to apply; I hand-tweaked it to make it apply, but the reindentation of t/t7900 does not look correct.

Show 19 quoted lines
> diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
> index 3f17f55..e6a3702 100755
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -23,7 +23,7 @@ check_equal()
>  {
>  	test_debug 'echo'
>  	test_debug "echo \"check a:\" \"{$1}\""
> -	test_debug "echo \"      b:\" \"{$2}\""
> +	test_debug "echo \"		 b:\" \"{$2}\""
>  	if [ "$1" = "$2" ]; then
>  		return 0
>  	else
> @@ -61,17 +61,17 @@ last_commit_message()
>  }
>  
>  test_expect_success 'init subproj' '
> -        test_create_repo subproj
> +		test_create_repo subproj

Perhaps this was originally done with an editor whose tabwidth was set to 4? It gives too much indentation when standard tabwidth of 8 is used.

Previous: David A. GreeneNext: David A. Greene
Message 10 of 28 in “Assorted contrib/subtree Patches”
  1. David A. GreeneFeb 5, 2013
  2. 01/13 contrib/subtree: Remove Test Number CommentsDavid A. Greene, Feb 5, 2013
  3. Junio C HamanoFeb 5, 2013
  4. 02/13 contrib/subtree: Use %B for Split Subject/BodyDavid A. Greene, Feb 5, 2013
  5. 03/13 contrib/subtree: Better Error Handling for addDavid A. Greene, Feb 5, 2013
  6. 04/13 contrib/subtree: Fix SynopsisDavid A. Greene, Feb 5, 2013
  7. 05/13 contrib/subtree: Honor DESTDIRDavid A. Greene, Feb 5, 2013
  8. 06/13 contrib/subtree: Make the Manual Directory if NeededDavid A. Greene, Feb 5, 2013
  9. 07/13 contrib/subtree: Fix whitespacesDavid A. Greene, Feb 5, 2013
  10. Junio C HamanoFeb 5, 2013
  11. 08/13 contrib/subtree: Add vim modelineDavid A. Greene, Feb 5, 2013
  12. Junio C HamanoFeb 5, 2013
  13. 09/13 contrib/subtree: Ignore testing directoryDavid A. Greene, Feb 5, 2013
  14. Junio C HamanoFeb 5, 2013
  15. 10/13 contrib/subtree: Code cleaning and refactoringDavid A. Greene, Feb 5, 2013
  16. Junio C HamanoFeb 5, 2013
  17. 11/13 contrib/subtree: Make each test self-containedDavid A. Greene, Feb 5, 2013
  18. Junio C HamanoFeb 5, 2013
  19. 12/13 contrib/subtree: Handle '--prefix' argument with a slash appendedDavid A. Greene, Feb 5, 2013
  20. Junio C HamanoFeb 5, 2013
  21. 13/13 contrib/subtree: Remove --annotateDavid A. Greene, Feb 5, 2013
  22. Junio C HamanoFeb 5, 2013
  23. Jakub SuderFeb 5, 2013
  24. James NylenFeb 5, 2013
  25. greened@obbligato.orgFeb 18, 2013
  26. James NylenFeb 18, 2013
  27. Junio C HamanoFeb 5, 2013
  28. greened@obbligato.orgFeb 18, 2013

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.