Re: [PATCH 4/4] remote: new show output style

From: Marc Branchaud <marcnarc@xiplink.com>
Date: Feb 19, 2009, 16:03 UTC
Message-ID: <499D82BC.7020500@xiplink.com>
In-Reply-To: <1235020471-59982-5-git-send-email-jaysoffian@gmail.com>

Jay, thanks a ton!  I'd been poking at this myself off and on over the last week -- I'm very glad to see you've done the work!

A couple of suggestions on the new format:

Jay Soffian wrote:

Show 29 quoted lines

> 
> @@ -137,21 +137,18 @@ cat > test/expect << EOF
>  * remote origin
>    URL: $(pwd)/one
>    HEAD branch: master
> -  Remote branch merged with 'git pull' while on branch master
> -    master
> -  New remote branch (next fetch will store in remotes/origin)
> -    master
> -  Tracked remote branches
> -    master
> -    side
> -  Local branches pushed with 'git push'
> +  Remote branches:
> +    master new (next fetch will store in remotes/origin)
> +    side   tracked
> +  Local branches configured for 'git pull':
> +    foo    rebases onto remote master
> +    master merges w/remote master
> +  Local branches configured for 'git push':
>      master:upstream
>      +refs/tags/lastbackup
>  * remote two
>    URL: ../two
> -  HEAD branches:
> -    another
> -    master
> +  HEAD branches: another, master
>  EOF

First, a nit: I don't know if the "w/remote" notation makes sense to non-English speakers.  I also like the alignment achieved by "merges with remote " (note the trailing space).

Second, I think it would be good to also change the format of the 'git push' list, for consistency:

	Local branches configured for 'git push':
	  master               fast-forwards remote upstream
	  refs/tags/lastbackup updates remote       refs/tags/lastbackup

Though I'm not really happy using "updates" when + is specified in the push refspec.  What, precisely, is a "non-fast forward update" anyway?  Is it essentially a rebase?  If so, maybe "rebases onto remote " would be better (again with a trailing space to get nice alignment).

Thanks again!

M.