summaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-12 23:48:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-12 23:48:38 (GMT)
commit054d2fa05cf0bc55fe1556c9e87d58d67a144f44 (patch)
treeefda16efdfad47941f14d19782d2f1518ef0c75c /builtin-grep.c
parenta8c37a0e011d67e3192834a0fffe17452ea57a08 (diff)
parent8efa5f629efb9a8af48619ee90dee02343e0f19d (diff)
downloadgit-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.zip
git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.gz
git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.bz2
Merge branch 'maint'
* maint: remote-curl: Fix Accept header for smart HTTP connections grep: -L should show empty files rebase--interactive: Ignore comments and blank lines in peek_next_command
Diffstat (limited to 'builtin-grep.c')
-rw-r--r--builtin-grep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index a5b6719..af6c6fe 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -191,8 +191,6 @@ static int grep_file(struct grep_opt *opt, const char *filename)
error("'%s': %s", filename, strerror(errno));
return 0;
}
- if (!st.st_size)
- return 0; /* empty file -- no grep hit */
if (!S_ISREG(st.st_mode))
return 0;
sz = xsize_t(st.st_size);