From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 31 Mar 2008 11:03:45 +0000 (+0200)
Subject: stage: disable whitespace warnings from git apply when staging updates
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc02ff85afe6c89ea38a2bba765504276dc3b113;p=tig.git

stage: disable whitespace warnings from git apply when staging updates
---

diff --git a/tig.c b/tig.c
index 5c7be40..466fc2d 100644
--- 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;