diff options
| author | Pavel Roskin <proski@gnu.org> | 2006-07-10 02:57:51 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-10 00:47:13 -0700 |
| commit | a9486b02ec7e03d17317fe538b0d06ca04379f23 (patch) | |
| tree | b5b4ac5d1caba95de4f2571b46ac600f43b48fce /builtin-apply.c | |
| parent | 82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (diff) | |
| download | git-a9486b02ec7e03d17317fe538b0d06ca04379f23.tar.gz git-a9486b02ec7e03d17317fe538b0d06ca04379f23.tar.xz | |
Avoid C99 comments, use old-style C comments instead.
This doesn't make the code uglier or harder to read, yet it makes the
code more portable. This also simplifies checking for other potential
incompatibilities. "gcc -std=c89 -pedantic" can flag many incompatible
constructs as warnings, but C99 comments will cause it to emit an error.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 1e5b846dd..c903146bb 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -14,14 +14,15 @@ #include "delta.h" #include "builtin.h" -// --check turns on checking that the working tree matches the -// files that are being modified, but doesn't apply the patch -// --stat does just a diffstat, and doesn't actually apply -// --numstat does numeric diffstat, and doesn't actually apply -// --index-info shows the old and new index info for paths if available. -// --index updates the cache as well. -// --cached updates only the cache without ever touching the working tree. -// +/* + * --check turns on checking that the working tree matches the + * files that are being modified, but doesn't apply the patch + * --stat does just a diffstat, and doesn't actually apply + * --numstat does numeric diffstat, and doesn't actually apply + * --index-info shows the old and new index info for paths if available. + * --index updates the cache as well. + * --cached updates only the cache without ever touching the working tree. + */ static const char *prefix; static int prefix_length = -1; static int newfd = -1; @@ -284,8 +285,8 @@ static void parse_traditional_patch(const char *first, const char *second, struc { char *name; - first += 4; // skip "--- " - second += 4; // skip "+++ " + first += 4; /* skip "--- " */ + second += 4; /* skip "+++ " */ if (is_dev_null(first)) { patch->is_new = 1; patch->is_delete = 0; |