Code

stage: disable whitespace warnings from git apply when staging updates
authorJonas Fonseca <fonseca@diku.dk>
Mon, 31 Mar 2008 11:03:45 +0000 (13:03 +0200)
committerJonas Fonseca <fonseca@diku.dk>
Mon, 31 Mar 2008 11:03:45 +0000 (13:03 +0200)
tig.c

diff --git a/tig.c b/tig.c
index 5c7be40520e4f1449194a69f4cfe5286ffd10f01..466fc2dc2dbb1d1a8ab592cafa65be6dadbc474c 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -4470,7 +4470,7 @@ stage_update_chunk(struct view *view, struct line *line)
                return FALSE;
 
        if (!string_format_from(cmd, &cmdsize,
-                               "git apply --cached %s - && "
+                               "git apply --whitespace=nowarn --cached %s - && "
                                "git update-index -q --unmerged --refresh 2>/dev/null",
                                stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
                return FALSE;