logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch (2125B)

    

  1. From 742272838f08fa1b9fe47ef842253ac84a502ee7 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Tue, 16 Mar 2021 17:21:31 -0700
  4. Subject: [PATCH] request-pull: use awk instead of perl to parse ls-remote
  5.  output
  7. ---
  8.  git-request-pull.sh | 48 +++++++++++++++++++++++++++------------------
  9.  1 file changed, 29 insertions(+), 19 deletions(-)
  11. diff --git a/git-request-pull.sh b/git-request-pull.sh
  12. index 775ba8ea11..a7177c5e1c 100755
  13. --- a/git-request-pull.sh
  14. +++ b/git-request-pull.sh
  15. @@ -82,37 +82,47 @@ die "fatal: No commits in common between $base and $head"
  16.  # Find a ref with the same name as $head that exists at the remote
  17.  # and points to the same commit as the local object.
  18.  find_matching_ref='
  19. -	my ($head,$headrev) = (@ARGV);
  20. -	my $pattern = qr{/\Q$head\E$};
  21. -	my ($remote_sha1, $found);
  22. +	function endswith(s, t) {
  23. +		n = length(s)
  24. +		m = length(t)
  25. +		return m <= n && substr(s, n - m + 1) == t
  26. +	}
  27.  
  28. -	while (<STDIN>) {
  29. -		chomp;
  30. -		my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
  31. +	{
  32. +		sha1 = $1
  33. +		ref = $2
  34.  
  35. -		if ($sha1 eq $head) {
  36. -			$found = $remote_sha1 = $sha1;
  37. -			break;
  38. +		if (sha1 == head) {
  39. +			found = remote_sha1 = sha1
  40. +			exit
  41.  		}
  42.  
  43. -		if ($ref eq $head || $ref =~ $pattern) {
  44. -			if ($deref eq "") {
  45. +		deref = index(ref, "^")
  46. +		if (deref)
  47. +			ref = substr(ref, 1, deref - 1)
  48. +
  49. +		if (ref == head || endswith(ref, "/" head)) {
  50. +			if (!deref) {
  51.  				# Remember the matching object on the remote side
  52. -				$remote_sha1 = $sha1;
  53. +				remote_sha1 = sha1
  54.  			}
  55. -			if ($sha1 eq $headrev) {
  56. -				$found = $ref;
  57. -				break;
  58. +			if (sha1 == headrev) {
  59. +				found = ref
  60. +				exit
  61.  			}
  62.  		}
  63.  	}
  64. -	if ($found) {
  65. -		$remote_sha1 = $headrev if ! defined $remote_sha1;
  66. -		print "$remote_sha1 $found\n";
  67. +
  68. +	END {
  69. +		if (found) {
  70. +			if (!remote_sha1)
  71. +				remote_sha1 = headrev
  72. +			print remote_sha1 " " found
  73. +		}
  74.  	}
  75.  '
  76.  
  77. -set fnord $(git ls-remote "$url" | @PERL_PATH@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
  78. +set fnord $(git ls-remote "$url" | awk -v "head=${remote:-HEAD}" -v "headrev=$headrev" "$find_matching_ref")
  79.  remote_sha1=$2
  80.  ref=$3
  81.  
  82. -- 
  83. 2.45.2