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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




> [...]
> 
>> 
> 
> 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




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux