diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-08 09:15:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-08 09:15:31 +0400 |
| commit | 92a75a391e66cfc278cf59741e484efd80c02176 (patch) | |
| tree | 13c842918d9368b93ef197f2bd0b64bac9b87368 /builtin | |
| parent | 4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7 (diff) | |
| parent | 2543d9b609d158f611e317738644e67cacac6b9a (diff) | |
Merge branch 'maint'
* maint:
Change C99 comments to old-style C comments
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 | ||||
| -rw-r--r-- | builtin/for-each-ref.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index fc1586350f..4dd4c3f494 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1589,7 +1589,7 @@ static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent) strcpy(hex, sha1_to_hex(suspect->commit->object.sha1)); printf("%s%c%d %d %d\n", hex, - ent->guilty ? ' ' : '*', // purely for debugging + ent->guilty ? ' ' : '*', /* purely for debugging */ ent->s_lno + 1, ent->lno + 1, ent->num_lines); diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 3a97953177..a2b28c6962 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -552,10 +552,10 @@ static void grab_values(struct atom_value *val, int deref, struct object *obj, v grab_person("committer", val, deref, obj, buf, sz); break; case OBJ_TREE: - // grab_tree_values(val, deref, obj, buf, sz); + /* grab_tree_values(val, deref, obj, buf, sz); */ break; case OBJ_BLOB: - // grab_blob_values(val, deref, obj, buf, sz); + /* grab_blob_values(val, deref, obj, buf, sz); */ break; default: die("Eh? Object of type %d?", obj->type); |