summaryrefslogtreecommitdiff
path: root/3a/d9096107bbe9168f55d4c4cb9dda2f61603e30
blob: 24dc04048ab6c5753f4c17c3bb90cdd7a744ba6b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191]
	helo=mx.sourceforge.net)
	by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
	(envelope-from <gavinandresen@gmail.com>) id 1Rjf4K-0006y2-1t
	for bitcoin-development@lists.sourceforge.net;
	Sat, 07 Jan 2012 22:48:56 +0000
Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of gmail.com
	designates 209.85.212.175 as permitted sender)
	client-ip=209.85.212.175; envelope-from=gavinandresen@gmail.com;
	helo=mail-wi0-f175.google.com; 
Received: from mail-wi0-f175.google.com ([209.85.212.175])
	by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-MD5:128)
	(Exim 4.76) id 1Rjf4H-0002LJ-Nt
	for bitcoin-development@lists.sourceforge.net;
	Sat, 07 Jan 2012 22:48:56 +0000
Received: by wibhq7 with SMTP id hq7so2885850wib.34
	for <bitcoin-development@lists.sourceforge.net>;
	Sat, 07 Jan 2012 14:48:47 -0800 (PST)
MIME-Version: 1.0
Received: by 10.181.13.179 with SMTP id ez19mr19434020wid.11.1325976527591;
	Sat, 07 Jan 2012 14:48:47 -0800 (PST)
Received: by 10.223.156.77 with HTTP; Sat, 7 Jan 2012 14:48:47 -0800 (PST)
In-Reply-To: <1325956875.73286.YahooMailNeo@web121006.mail.ne1.yahoo.com>
References: <1325956875.73286.YahooMailNeo@web121006.mail.ne1.yahoo.com>
Date: Sat, 7 Jan 2012 17:48:47 -0500
Message-ID: <CABsx9T00=X+0-59+pQN6MqAox8hnqm-08gr2GA=QWfqe_qSF5g@mail.gmail.com>
From: Gavin Andresen <gavinandresen@gmail.com>
To: Amir Taaki <zgenjix@yahoo.com>
Content-Type: text/plain; charset=ISO-8859-1
X-Spam-Score: -1.6 (-)
X-Spam-Report: Spam Filtering performed by mx.sourceforge.net.
	See http://spamassassin.org/tag/ for more details.
	-1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for
	sender-domain
	0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
	(gavinandresen[at]gmail.com)
	-0.0 SPF_PASS               SPF: sender matches SPF record
	-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
	author's domain
	0.1 DKIM_SIGNED            Message has a DKIM or DK signature,
	not necessarily valid
	-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
X-Headers-End: 1Rjf4H-0002LJ-Nt
Cc: Bitcoin Dev <bitcoin-development@lists.sourceforge.net>
Subject: Re: [Bitcoin-development] Pull 748 pay to script hash
X-BeenThere: bitcoin-development@lists.sourceforge.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <bitcoin-development.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
	<mailto:bitcoin-development-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development>
List-Post: <mailto:bitcoin-development@lists.sourceforge.net>
List-Help: <mailto:bitcoin-development-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
	<mailto:bitcoin-development-request@lists.sourceforge.net?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2012 22:48:56 -0000

> It might be better for code review if the old pull is reverted and then this one re-requested. That will make it easier
> to see the real changes.

I count the 1 major merge then 8 commits to fix bugs or tweak
things...  I just tried reverting them and stopped when I got scared
I'll accidentally revert a fix we do want to keep.

Instead, I updated my gavinandresen/master github branch to the state
of the tree just before the OP_EVAL merge, so for code review purposes
you can look at:

https://github.com/gavinandresen/bitcoin-git/compare/master...pay_to_script_hash

There are unrelated 0.6 pulls in those changes, too, but it should be
pretty obvious what is what.

-- 
--
Gavin Andresen