summaryrefslogtreecommitdiff
path: root/transport-helper.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 16:59:30 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-16 16:59:30 -0700
commitb2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch)
tree2e6088ca17b4042ccf9c658148cd5af55021c8a1 /transport-helper.c
parent06316234accdcb6608506aed6600cd60ff5c5c8e (diff)
parentfbcda3c0a72cbcc105100ebef1b1dae54d854204 (diff)
downloadgit-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.gz
Merge branch 'maint'
* maint: Prepare draft release notes to 1.7.4.2 gitweb: highlight: replace tabs with spaces make_absolute_path: return the input path if it points to our buffer valgrind: ignore SSE-based strlen invalid reads diff --submodule: split into bite-sized pieces cherry: split off function to print output lines branch: split off function that writes tracking info and commit subject standardize brace placement in struct definitions compat: make gcc bswap an inline function enums: omit trailing comma for portability Conflicts: RelNotes
Diffstat (limited to 'transport-helper.c')
-rw-r--r--transport-helper.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/transport-helper.c b/transport-helper.c
index ba06b70cce..0c5b1bd994 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -12,8 +12,7 @@
static int debug;
-struct helper_data
-{
+struct helper_data {
const char *name;
struct child_process *helper;
FILE *out;