git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] git-remote-testgit: avoid process substitution
Date: Thu, 25 Apr 2013 07:56:19 +0200	[thread overview]
Message-ID: <5178C583.6000703@viscovery.net> (raw)
In-Reply-To: <5177980A.4090305@viscovery.net>

From: Johannes Sixt <j6t@kdbg.org>

Bash on Windows does not implement process substitution.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 4/24/2013 10:30, schrieb Johannes Sixt:
> Am 4/24/2013 10:04, schrieb Felipe Contreras:
>> On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>>> Am 4/23/2013 21:31, schrieb Junio C Hamano:
>>>> * fc/transport-helper-error-reporting (2013-04-17) 9 commits
>>>>   (merged to 'next' on 2013-04-22 at 5ba6467)
>>>>  + transport-helper: update remote helper namespace
>>>>  + transport-helper: trivial code shuffle
>>>>  + transport-helper: warn when refspec is not used
>>>>  + transport-helper: clarify pushing without refspecs
>>>>  + transport-helper: update refspec documentation
>>>>  + transport-helper: clarify *:* refspec
>>>>  + transport-helper: improve push messages
>>>>  + transport-helper: mention helper name when it dies
>>>>  + transport-helper: report errors properly
>>>>
>>>>  Update transport helper to report errors and maintain ref hierarchy
>>>>  used to keep track of remote helper state better.
>>>>
>>>>  Will merge to 'master'.
>>>
>>> Please don't, yet. There is a new test case that fails on Windows. I'll
>>> have to figure out a work-around.
>>
>> Which test case? If it it failed, it failed before this series. I
>> don't see how this new series would affect anything.
> 
> The test introduced in the commit at the tip: 'push update refs'.

Here is a fix. It assumes that the list of refs after the import is
a superset of the refs before the import. (Can refs be deleted
via fast-import?)

 git-remote-testgit | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/git-remote-testgit b/git-remote-testgit
index 23c9d40..e99d5fa 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -91,13 +91,15 @@ do
 
 		git fast-import "${testgitmarks_args[@]}" --quiet
 
-		after=$(git for-each-ref --format='%(refname) %(objectname)')
-
 		# figure out which refs were updated
-		join -e 0 -o '0 1.2 2.2' -a 2 <(echo "$before") <(echo "$after") |
-		while read ref a b
+		git for-each-ref --format='%(refname) %(objectname)' |
+		while read ref a
 		do
-			test $a == $b && continue
+			case "$before" in
+			*"$ref $a"*)
+				continue
+				;;
+			esac
 			echo "ok $ref"
 		done
 
-- 
1.8.2.388.g36592d7

  reply	other threads:[~2013-04-25  5:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-22 20:07 What's cooking in git.git (Apr 2013, #07; Mon, 22) Junio C Hamano
2013-04-23 19:31 ` What's cooking in git.git (Apr 2013, #08; Tue, 23) Junio C Hamano
2013-04-24  7:57   ` Johannes Sixt
2013-04-24  8:04     ` Felipe Contreras
2013-04-24  8:30       ` Johannes Sixt
2013-04-25  5:56         ` Johannes Sixt [this message]
2013-04-25 14:57           ` [PATCH] git-remote-testgit: avoid process substitution Junio C Hamano
2013-04-25 17:50             ` Felipe Contreras
2013-04-25 18:25               ` Junio C Hamano
2013-04-25 19:24                 ` Felipe Contreras
2013-04-25 20:06                   ` Junio C Hamano
2013-04-25 20:31                     ` Felipe Contreras
2013-04-26 21:56           ` Felipe Contreras
2013-04-26 22:25             ` Junio C Hamano
2013-04-26 22:45               ` Felipe Contreras
2013-04-26 23:26                 ` Re* " Junio C Hamano
2013-04-27 19:13                   ` Johannes Sixt
2013-04-29 17:36                     ` Junio C Hamano
2013-04-29 17:41                       ` [PATCH 0/3] De-bashing remote-testgit Junio C Hamano
2013-04-29 17:41                         ` [PATCH 1/3] git-remote-testgit: avoid process substitution Junio C Hamano
2013-04-29 17:41                         ` [PATCH 2/3] git-remote-testgit: further remove some bashisms Junio C Hamano
2013-04-29 17:41                         ` [PATCH 3/3] git-remote-testgit: build it to run under $SHELL_PATH Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5178C583.6000703@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).