summaryrefslogtreecommitdiff
path: root/t/t4051/dummy.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 16:56:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-27 16:56:24 (GMT)
commitfda65fadb6e98b5b8ea8058bbeaa29d983f335cb (patch)
tree01a4d9ee1f591fea9d34e0e6bfd22991050b520d /t/t4051/dummy.c
parentdf5a925523e627cd20ce11f570d418dfae2ac7d8 (diff)
parent6f8d9bccb2c3694c62d14225976689c1e8c50fa5 (diff)
downloadgit-fda65fadb6e98b5b8ea8058bbeaa29d983f335cb.zip
git-fda65fadb6e98b5b8ea8058bbeaa29d983f335cb.tar.gz
git-fda65fadb6e98b5b8ea8058bbeaa29d983f335cb.tar.bz2
Merge branch 'rs/xdiff-hunk-with-func-line' into maint
"git show -W" (extend hunks to cover the entire function, delimited by lines that match the "funcname" pattern) used to show the entire file when a change added an entire function at the end of the file, which has been fixed. * rs/xdiff-hunk-with-func-line: xdiff: fix merging of appended hunk with -W grep: -W: don't extend context to trailing empty lines t7810: add test for grep -W and trailing empty context lines xdiff: don't trim common tail with -W xdiff: -W: don't include common trailing empty lines in context xdiff: ignore empty lines before added functions with -W xdiff: handle appended chunks better with -W xdiff: factor out match_func_rec() t4051: rewrite, add more tests
Diffstat (limited to 't/t4051/dummy.c')
-rw-r--r--t/t4051/dummy.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4051/dummy.c b/t/t4051/dummy.c
new file mode 100644
index 0000000..a43016e
--- /dev/null
+++ b/t/t4051/dummy.c
@@ -0,0 +1,7 @@
+
+static int dummy(void) // Begin of dummy
+{
+ int rc = 0;
+
+ return rc;
+} // End of dummy