From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2015 20:00:23 +0000 (-0700)
Subject: Merge branch 'jk/tag-h-column-is-a-listing-option' into maint
X-Git-Tag: v2.4.0-rc1~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d8279c7d85f82edea8c86e4e7c2fbd787ae09735?ds=inline;hp=-c

Merge branch 'jk/tag-h-column-is-a-listing-option' into maint

"git tag -h" used to show the "--column" and "--sort" options
that are about listing in a wrong section.

* jk/tag-h-column-is-a-listing-option:
tag: fix some mis-organized options in "-h" listing
---

d8279c7d85f82edea8c86e4e7c2fbd787ae09735
diff --combined builtin/tag.c
index e633f4efdb,de1beed2f9..d315827cf5
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@@ -85,7 -85,7 +85,7 @@@ static int in_commit_list(const struct 
  enum contains_result {
  	CONTAINS_UNKNOWN = -1,
  	CONTAINS_NO = 0,
 -	CONTAINS_YES = 1,
 +	CONTAINS_YES = 1
  };
  
  /*
@@@ -576,6 -576,7 +576,6 @@@ int cmd_tag(int argc, const char **argv
  	struct strbuf ref = STRBUF_INIT;
  	unsigned char object[20], prev[20];
  	const char *object_ref, *tag;
 -	struct ref_lock *lock;
  	struct create_tag_options opt;
  	char *cleanup_arg = NULL;
  	int annotate = 0, force = 0, lines = -1;
@@@ -583,8 -584,6 +583,8 @@@
  	const char *msgfile = NULL, *keyid = NULL;
  	struct msg_arg msg = { 0, STRBUF_INIT };
  	struct commit_list *with_commit = NULL;
 +	struct ref_transaction *transaction;
 +	struct strbuf err = STRBUF_INIT;
  	struct option options[] = {
  		OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
  		{ OPTION_INTEGER, 'n', NULL, &lines, N_("n"),
@@@ -605,13 -604,13 +605,13 @@@
  		OPT_STRING('u', "local-user", &keyid, N_("key-id"),
  					N_("use another key to sign the tag")),
  		OPT__FORCE(&force, N_("replace the tag if exists")),
+ 
+ 		OPT_GROUP(N_("Tag listing options")),
  		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
  		{
  			OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"),
  			PARSE_OPT_NONEG, parse_opt_sort
  		},
- 
- 		OPT_GROUP(N_("Tag listing options")),
  		{
  			OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
  			N_("print only tags that contain the commit"),
@@@ -730,17 -729,14 +730,17 @@@
  	if (annotate)
  		create_tag(object, tag, &buf, &opt, prev, object);
  
 -	lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL);
 -	if (!lock)
 -		die(_("%s: cannot lock the ref"), ref.buf);
 -	if (write_ref_sha1(lock, object, NULL) < 0)
 -		die(_("%s: cannot update the ref"), ref.buf);
 +	transaction = ref_transaction_begin(&err);
 +	if (!transaction ||
 +	    ref_transaction_update(transaction, ref.buf, object, prev,
 +				   0, 1, NULL, &err) ||
 +	    ref_transaction_commit(transaction, &err))
 +		die("%s", err.buf);
 +	ref_transaction_free(transaction);
  	if (force && !is_null_sha1(prev) && hashcmp(prev, object))
  		printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));
  
 +	strbuf_release(&err);
  	strbuf_release(&buf);
  	strbuf_release(&ref);
  	return 0;