Re: [PATCH v4 8/8] use smudgeToFile filter in recursive merge

Junio C Hamano writes: >> +int smudge_to_file = can_smudge_to_file(path); > > This does not compile with decl-after-statement. I suspect other > patches in this series have the same issue but I did not check. Do > you say "make DEVELOPER=1"? As a tentative workaround, I've

Re: [PATCH v4 8/8] use smudgeToFile filter in recursive merge

Joey Hess writes: > @@ -781,6 +773,7 @@ static void update_file_flags(struct merge_options *o, > } > if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { > int fd; > + int isreg = S_ISREG(mode); You probably want to move t

[PATCH v4 8/8] use smudgeToFile filter in recursive merge

Recursive merge updates the work tree and so should use the smudgeToFile filter. At this point, smudgeToFile is run by everything that updates work tree files. Signed-off-by: Joey Hess --- merge-recursive.c | 42 -- t/t0021-conversion.sh | 16