Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin-apply.c: pass ws_rule down to match_fragment()
author
Junio C Hamano
<gitster@pobox.com>
Wed, 30 Jan 2008 23:13:37 +0000
(15:13 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 5 Feb 2008 08:38:41 +0000
(
00:38
-0800)
This is necessary to allow match_fragment() to attempt a match
with a preimage that is based on a version before whitespace
errors were fixed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ee810b7
)
diff --git
a/builtin-apply.c
b/builtin-apply.c
index 2af625a43587c5ee46f450dde264266c50e8d59b..5f3c047f2240a85a7c426c74cc5831f57dcc736f 100644
(file)
--- a/
builtin-apply.c
+++ b/
builtin-apply.c
@@
-1614,6
+1614,7
@@
static int match_fragment(struct image *img,
struct image *postimage,
unsigned long try,
int try_lno,
struct image *postimage,
unsigned long try,
int try_lno,
+ unsigned ws_rule,
int match_beginning, int match_end)
{
int i;
int match_beginning, int match_end)
{
int i;
@@
-1656,6
+1657,7
@@
static int find_pos(struct image *img,
struct image *preimage,
struct image *postimage,
int line,
struct image *preimage,
struct image *postimage,
int line,
+ unsigned ws_rule,
int match_beginning, int match_end)
{
int i;
int match_beginning, int match_end)
{
int i;
@@
-1691,7
+1693,7
@@
static int find_pos(struct image *img,
for (i = 0; ; i++) {
if (match_fragment(img, preimage, postimage,
for (i = 0; ; i++) {
if (match_fragment(img, preimage, postimage,
- try, try_lno,
+ try, try_lno,
ws_rule,
match_beginning, match_end))
return try_lno;
match_beginning, match_end))
return try_lno;
@@
-1930,8
+1932,8
@@
static int apply_one_fragment(struct image *img, struct fragment *frag,
for (;;) {
for (;;) {
- applied_pos = find_pos(img, &preimage, &postimage,
-
pos
, match_beginning, match_end);
+ applied_pos = find_pos(img, &preimage, &postimage,
pos,
+
ws_rule
, match_beginning, match_end);
if (applied_pos >= 0)
break;
if (applied_pos >= 0)
break;