summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-08 05:15:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-08 05:15:31 (GMT)
commit92a75a391e66cfc278cf59741e484efd80c02176 (patch)
tree13c842918d9368b93ef197f2bd0b64bac9b87368
parent4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7 (diff)
parent2543d9b609d158f611e317738644e67cacac6b9a (diff)
downloadgit-92a75a391e66cfc278cf59741e484efd80c02176.zip
git-92a75a391e66cfc278cf59741e484efd80c02176.tar.gz
git-92a75a391e66cfc278cf59741e484efd80c02176.tar.bz2
Merge branch 'maint'
* maint: Change C99 comments to old-style C comments
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/for-each-ref.c4
-rw-r--r--remote.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index fc15863..4dd4c3f 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 3a97953..a2b28c6 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);
diff --git a/remote.c b/remote.c
index 0f073e0..ea2323b 100644
--- a/remote.c
+++ b/remote.c
@@ -478,7 +478,7 @@ static void read_config(void)
unsigned char sha1[20];
const char *head_ref;
int flag;
- if (default_remote_name) // did this already
+ if (default_remote_name) /* did this already */
return;
default_remote_name = xstrdup("origin");
current_branch = NULL;