From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Jul 2014 18:35:45 +0000 (-0700)
Subject: Merge branch 'jk/tag-sort'
X-Git-Tag: v2.1.0-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c3d2bc720cd56af5a18eec219890dcff701680f8?hp=-c

Merge branch 'jk/tag-sort'

* jk/tag-sort:
tag: support configuring --sort via .gitconfig
tag: fix --sort tests to use cat<<-\EOF format
---

c3d2bc720cd56af5a18eec219890dcff701680f8
diff --combined Documentation/config.txt
index 1d718bdb96,9d4f249606..c55c22ab7b
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1905,7 -1905,12 +1905,7 @@@ pack.useBitmaps:
  	you are debugging pack bitmaps.
  
  pack.writebitmaps::
 -	When true, git will write a bitmap index when packing all
 -	objects to disk (e.g., when `git repack -a` is run).  This
 -	index can speed up the "counting objects" phase of subsequent
 -	packs created for clones and fetches, at the cost of some disk
 -	space and extra time spent on the initial repack.  Defaults to
 -	false.
 +	This is a deprecated synonym for `repack.writeBitmaps`.
  
  pack.writeBitmapHashCache::
  	When true, git will include a "hash cache" section in the bitmap
@@@ -2182,15 -2187,7 +2182,15 @@@ repack.packKeptObjects:
  	`--pack-kept-objects` was passed. See linkgit:git-repack[1] for
  	details. Defaults to `false` normally, but `true` if a bitmap
  	index is being written (either via `--write-bitmap-index` or
 -	`pack.writeBitmaps`).
 +	`repack.writeBitmaps`).
 +
 +repack.writeBitmaps::
 +	When true, git will write a bitmap index when packing all
 +	objects to disk (e.g., when `git repack -a` is run).  This
 +	index can speed up the "counting objects" phase of subsequent
 +	packs created for clones and fetches, at the cost of some disk
 +	space and extra time spent on the initial repack.  Defaults to
 +	false.
  
  rerere.autoupdate::
  	When set to true, `git-rerere` updates the index with the
@@@ -2354,6 -2351,11 +2354,11 @@@ submodule.<name>.ignore:
  	"--ignore-submodules" option. The 'git submodule' commands are not
  	affected by this setting.
  
+ tag.sort::
+ 	This variable controls the sort ordering of tags when displayed by
+ 	linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
+ 	value of this variable will be used as the default.
+ 
  tar.umask::
  	This variable can be used to restrict the permission bits of
  	tar archive entries.  The default is 0002, which turns off the
diff --combined builtin/tag.c
index 9d7643f127,e063035515..19eb747820
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@@ -32,6 -32,8 +32,8 @@@ static const char * const git_tag_usage
  #define SORT_MASK       0x7fff
  #define REVERSE_SORT    0x8000
  
+ static int tag_sort;
+ 
  struct tag_filter {
  	const char **patterns;
  	int lines;
@@@ -83,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
  };
  
  /*
@@@ -346,9 -348,51 +348,51 @@@ static const char tag_template_nocleanu
  	"Lines starting with '%c' will be kept; you may remove them"
  	" yourself if you want to.\n");
  
+ /*
+  * Parse a sort string, and return 0 if parsed successfully. Will return
+  * non-zero when the sort string does not parse into a known type. If var is
+  * given, the error message becomes a warning and includes information about
+  * the configuration value.
+  */
+ static int parse_sort_string(const char *var, const char *arg, int *sort)
+ {
+ 	int type = 0, flags = 0;
+ 
+ 	if (skip_prefix(arg, "-", &arg))
+ 		flags |= REVERSE_SORT;
+ 
+ 	if (skip_prefix(arg, "version:", &arg) || skip_prefix(arg, "v:", &arg))
+ 		type = VERCMP_SORT;
+ 	else
+ 		type = STRCMP_SORT;
+ 
+ 	if (strcmp(arg, "refname")) {
+ 		if (!var)
+ 			return error(_("unsupported sort specification '%s'"), arg);
+ 		else {
+ 			warning(_("unsupported sort specification '%s' in variable '%s'"),
+ 				var, arg);
+ 			return -1;
+ 		}
+ 	}
+ 
+ 	*sort = (type | flags);
+ 
+ 	return 0;
+ }
+ 
  static int git_tag_config(const char *var, const char *value, void *cb)
  {
- 	int status = git_gpg_config(var, value, cb);
+ 	int status;
+ 
+ 	if (!strcmp(var, "tag.sort")) {
+ 		if (!value)
+ 			return config_error_nonbool(var);
+ 		parse_sort_string(var, value, &tag_sort);
+ 		return 0;
+ 	}
+ 
+ 	status = git_gpg_config(var, value, cb);
  	if (status)
  		return status;
  	if (starts_with(var, "column."))
@@@ -522,20 -566,8 +566,8 @@@ static int parse_opt_points_at(const st
  static int parse_opt_sort(const struct option *opt, const char *arg, int unset)
  {
  	int *sort = opt->value;
- 	int flags = 0;
  
- 	if (skip_prefix(arg, "-", &arg))
- 		flags |= REVERSE_SORT;
- 
- 	if (skip_prefix(arg, "version:", &arg) || skip_prefix(arg, "v:", &arg))
- 		*sort = VERCMP_SORT;
- 	else
- 		*sort = STRCMP_SORT;
- 
- 	if (strcmp(arg, "refname"))
- 		die(_("unsupported sort specification %s"), arg);
- 	*sort |= flags;
- 	return 0;
+ 	return parse_sort_string(NULL, arg, sort);
  }
  
  int cmd_tag(int argc, const char **argv, const char *prefix)
@@@ -548,7 -580,7 +580,7 @@@
  	struct create_tag_options opt;
  	char *cleanup_arg = NULL;
  	int annotate = 0, force = 0, lines = -1;
- 	int cmdmode = 0, sort = 0;
+ 	int cmdmode = 0;
  	const char *msgfile = NULL, *keyid = NULL;
  	struct msg_arg msg = { 0, STRBUF_INIT };
  	struct commit_list *with_commit = NULL;
@@@ -574,7 -606,7 +606,7 @@@
  		OPT__FORCE(&force, N_("replace the tag if exists")),
  		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
  		{
- 			OPTION_CALLBACK, 0, "sort", &sort, N_("type"), N_("sort tags"),
+ 			OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"),
  			PARSE_OPT_NONEG, parse_opt_sort
  		},
  
@@@ -630,9 -662,9 +662,9 @@@
  			copts.padding = 2;
  			run_column_filter(colopts, &copts);
  		}
- 		if (lines != -1 && sort)
+ 		if (lines != -1 && tag_sort)
  			die(_("--sort and -n are incompatible"));
- 		ret = list_tags(argv, lines == -1 ? 0 : lines, with_commit, sort);
+ 		ret = list_tags(argv, lines == -1 ? 0 : lines, with_commit, tag_sort);
  		if (column_active(colopts))
  			stop_column_filter();
  		return ret;