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

Re: [PATCH] Allow tracking branches to set up rebase by default.

From
Dustin Sallings <dustin@spy.net>
Date
May 10, 2008, 22:36 UTC
Message-ID
<1206EB02-2AE6-4A97-AF00-D16B8E686D9B@spy.net>
In-Reply-To
<7vfxsq9f3n.fsf@gitster.siamese.dyndns.org>
On May 10, 2008, at 11:41, Junio C Hamano wrote:
Show 8 quoted lines
> - die_bad_config() takes a variable name without surrounding  
> explanatory
>   text.  If you actually tested your patch and looked at the error
>   message, it would have been blatantly obvious and you would have
>   noticed it.  Not a good sign.
>
> - Test not just the success cases but failure cases; test not just
>   explicitly configured cases but also default cases.
	You're right, I didn't test misconfiguration cases.  I've updated the  
patch per your recommendations with a lot more tests and have manually  
tested the error messages to ensure they make sense.
	Does it make sense in the cases where a value is bad to list the  
valid values?  I don't see a precedent (so I don't know what format  
would be most desirable), but it might be friendly.
> Also I suspect that we would want to test cases where
> autosetuprebase is given but autosetupmerge is not.
	This code isn't so much dependent on that variable, but on the  
effects of that variable, which may be overridden by the --track and -- 
no-track parameters.  I think it'd be best to leave the effects of  
that variable in its own tests wrt tracking since this code doesn't  
kick in until after the tracking is set up.
Show 6 quoted lines
> Another thing we might want to address is to move parsing of branch.*
> configuration variables out of git_default_config().  They are  
> unnecessary
> for majority of commands that do not create new branches.  But that  
> would
> be a separate topic if we were to do so.
	I agree with this.  I tried initially to not have it be part of the  
default config parser, but it seemed a lot more disruptive, so I just  
followed autosetupmerge.
	Thanks for your input again.  New patch to follow.
-- 
Dustin Sallings
Previous: Junio C HamanoNext: Dustin Sallings
Message 8 of 12 in “Allow local branching to set up rebase by default.”
  1. Allow local branching to set up rebase by default.Dustin Sallings, Apr 29, 2008
  2. Jay SoffianApr 29, 2008
  3. Junio C HamanoMay 7, 2008
  4. Dustin SallingsMay 8, 2008
  5. Junio C HamanoMay 8, 2008
  6. Allow tracking branches to set up rebase by default.Dustin Sallings, May 8, 2008
  7. Junio C HamanoMay 10, 2008
  8. Dustin SallingsMay 10, 2008
  9. Allow tracking branches to set up rebase by default.Dustin Sallings, May 10, 2008
  10. Doc: Mention branch.<name>.rebase applies to "git pull"Dustin Sallings, May 8, 2008
  11. Dustin SallingsMay 7, 2008
  12. Junio C HamanoMay 7, 2008

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.