use git am --whitespace=nowarn
authorStefan Metzmacher <metze@samba.org>
Wed, 14 Nov 2007 15:48:35 +0000 (09:48 -0600)
committerStefan Metzmacher <metze@samba.org>
Wed, 14 Nov 2007 15:48:35 +0000 (09:48 -0600)
metze

samba4-sync.pl

index 9e6eb31..36f6c79 100755 (executable)
@@ -253,7 +253,7 @@ sub generate_patch($$)
 sub apply_patch($)
 {
        my ($r) = @_;
-       my $applycmd = "cd $GIT_PATH && git am --binary $r->{patch_path}";
+       my $applycmd = "cd $GIT_PATH && git am --whitespace=nowarn --binary $r->{patch_path}";
 
        my $apply = `$applycmd` || confess "$applycmd: failed";
 }