summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-22 16:35:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-22 16:35:36 (GMT)
commit262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch)
tree1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /diff.c
parent6df2ffaeef3f593214e88d9c148a7f3504f13e5e (diff)
parenta4c24549acf16f7917ea3ddd811c6c61afc5689c (diff)
downloadgit-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.zip
git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.gz
git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.bz2
Merge branch 'maint'
* maint: Update draft release notes to 1.7.1.1 tests: remove unnecessary '^' from 'expr' regular expression Conflicts: diff.c
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 2327cea..c692526 100644
--- a/diff.c
+++ b/diff.c
@@ -2620,7 +2620,6 @@ static void fill_metainfo(struct strbuf *msg,
}
/* fallthru */
default:
- /* nothing */
*must_show_header = 0;
}
if (one && two && hashcmp(one->sha1, two->sha1)) {