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

Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed

From
Marc Balmer <marc@msys.ch>
Date
Jan 2, 2019, 09:13 UTC
Message-ID
<A447E554-FFF7-4F70-A735-80C44A2285A4@msys.ch>
In-Reply-To
<20190101131947.GA18907@ash>
Show 24 quoted lines
> [...]
> 
>> 
> 
> Hmm.. I'm not that familiar with git-subtree.sh, so here's one last
> blind shot.
> 
> There's a format change between git-show and git-rev-parse. The former
> separates commits by spaces while the latter by newlines. Will this
> help?
> 
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index 147201dc6c..23f570beee 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -633,7 +633,7 @@ process_split_commit () {
> 	else
> 		# processing commit without normal parent information;
> 		# fetch from repo
> -		parents=$(git rev-parse "$rev^@")
> +		parents=$(git rev-parse "$rev^@" | tr '\n' ' ')
> 		extracount=$(($extracount + 1))
> 	fi
> 
Unfortunately, this did not change the situation.  It still segfaults.
> --
> Duy
Previous: Duy NguyenNext: Strain, Roger L.
Message 9 of 12 in “Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed”
  1. Marc BalmerDec 31, 2018
  2. Duy NguyenDec 31, 2018
  3. Marc BalmerDec 31, 2018
  4. Duy NguyenDec 31, 2018
  5. Marc BalmerDec 31, 2018
  6. Duy NguyenDec 31, 2018
  7. Marc BalmerDec 31, 2018
  8. Duy NguyenJan 1, 2019
  9. Marc BalmerJan 2, 2019
  10. Strain, Roger L.Jan 2, 2019
  11. Johannes SchindelinJan 3, 2019
  12. Strain, Roger L.Jan 3, 2019

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.