From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Jun 2010 05:15:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~94
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92a75a391e66cfc278cf59741e484efd80c02176?hp=-c

Merge branch 'maint'

* maint:
Change C99 comments to old-style C comments
---

92a75a391e66cfc278cf59741e484efd80c02176
diff --combined builtin/for-each-ref.c
index 3a97953177,7f5011f75e..a2b28c6962
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@@ -227,9 -227,6 +227,9 @@@ static void grab_common_values(struct a
  			strcpy(s, sha1_to_hex(obj->sha1));
  			v->s = s;
  		}
 +		else if (!strcmp(name, "objectname:short")) {
 +			v->s = find_unique_abbrev(obj->sha1, DEFAULT_ABBREV);
 +		}
  	}
  }
  
@@@ -552,10 -549,10 +552,10 @@@ static void grab_values(struct atom_val
  		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 --combined remote.c
index 0f073e0b5f,26ce56046d..ea2323bac3
--- a/remote.c
+++ b/remote.c
@@@ -443,8 -443,6 +443,8 @@@ static int handle_config(const char *ke
  	} else if (!strcmp(subkey, ".tagopt")) {
  		if (!strcmp(value, "--no-tags"))
  			remote->fetch_tags = -1;
 +		else if (!strcmp(value, "--tags"))
 +			remote->fetch_tags = 2;
  	} else if (!strcmp(subkey, ".proxy")) {
  		return git_config_string((const char **)&remote->http_proxy,
  					 key, value);
@@@ -478,7 -476,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;