summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-05 07:52:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-05 07:52:32 (GMT)
commit82cc8d839bbfd3d13f308145bdae4c9622de57e2 (patch)
treee574b2dc248b35c14478359070c90b0bb21fe363 /builtin-apply.c
parentb2e2ddfed8006590bc5b8f4f2a22046891958f28 (diff)
parent6c2f207b2316149ee8dfaf026e4a869ff9ab42f7 (diff)
downloadgit-82cc8d839bbfd3d13f308145bdae4c9622de57e2.zip
git-82cc8d839bbfd3d13f308145bdae4c9622de57e2.tar.gz
git-82cc8d839bbfd3d13f308145bdae4c9622de57e2.tar.bz2
Merge branch 'maint'
* maint: Remove unsupported C99 style struct initializers in git-archive. Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Use ULONG_MAX rather than implicit cast of -1.
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index db7cdce..aad5526 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -43,7 +43,7 @@ static int apply_verbosely;
static int no_add;
static int show_index_info;
static int line_termination = '\n';
-static unsigned long p_context = -1;
+static unsigned long p_context = ULONG_MAX;
static const char apply_usage[] =
"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";