From: Kjetil Barvik <barvik@broadpark.no>
Date: Mon, 9 Feb 2009 20:54:52 +0000 (+0100)
Subject: show_patch_diff(): remove a call to fstat()
X-Git-Tag: v1.6.3-rc0~147^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91fcbcbdcdd845bd43104c5ac0af4c40da15223b;p=git.git

show_patch_diff(): remove a call to fstat()

Currently inside show_patch_diff() we have an fstat() call after an
ok lstat() call.  Since before the call to fstat() we have already
tested for the link case with S_ISLNK(), the fstat() can be removed.

Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/combine-diff.c b/combine-diff.c
index bccc018ab..4300319cc 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -713,9 +713,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			result_size = buf.len;
 			result = strbuf_detach(&buf, NULL);
 			elem->mode = canon_mode(st.st_mode);
-		}
-		else if (0 <= (fd = open(elem->path, O_RDONLY)) &&
-			 !fstat(fd, &st)) {
+		} else if (0 <= (fd = open(elem->path, O_RDONLY))) {
 			size_t len = xsize_t(st.st_size);
 			ssize_t done;
 			int is_file, i;