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

kd/

From
Kevin Daudt <me@ikke.info>
Date
Jul 4, 2015, 21:00 UTC
Message-ID
<20150704210032.GB7345@vps892.directvps.nl>
In-Reply-To
<xmqqh9q64a9p.fsf@gitster.dls.corp.google.com>
On Wed, Jun 17, 2015 at 08:36:34AM -0700, Junio C Hamano wrote:
Show 6 quoted lines
> Kevin Daudt <me@ikke.info> writes:
> 
> > -		require_clean_work_tree "pull with rebase" "Please commit or stash them."
> > +		if [ $(git config --bool --get rebase.autostash || echo false) = false ]
> 
> Style (use of []).
Fixed it.
Show 12 quoted lines
> 
> Shouldn't you be doing
> 
> 	if ...
> 	then        	
> 		on an unborn
> 	elif we are not doing autostash
> 		require clean work tree
> 	fi
> 
> which does not need unnecessarily deep nesting?
> 
You are right, much simpler. New patch is underway.
Previous: Junio C HamanoNext: Kevin Daudt
Message 9 of 16 in “pull: allow dirty tree when rebase.autostash enabled”
  1. pull: allow dirty tree when rebase.autostash enabledKevin Daudt, Jun 2, 2015
  2. Paul TanJun 3, 2015
  3. 1/2 t5520-pull: Simplify --rebase with dirty tree testKevin Daudt, Jun 6, 2015
  4. 2/2 pull: allow dirty tree when rebase.autostash enabledKevin Daudt, Jun 6, 2015
  5. Paul TanJun 11, 2015
  6. Kevin DaudtJun 17, 2015
  7. pull: allow dirty tree when rebase.autostash enabledKevin Daudt, Jun 17, 2015
  8. Junio C HamanoJun 17, 2015
  9. kd/Kevin Daudt, Jul 4, 2015
  10. pull: allow dirty tree when rebase.autostash enabledKevin Daudt, Jul 4, 2015
  11. Junio C HamanoJul 6, 2015
  12. pull: allow dirty tree when rebase.autostash enabledPaul Tan, Jul 7, 2015
  13. Kevin DaudtJul 22, 2015
  14. Junio C HamanoJul 22, 2015
  15. Kevin DaudtJul 22, 2015
  16. Paul TanJun 11, 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.