From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:57:44 +0000 (-0700)
Subject: Merge branch 'jk/rev-parse-local-env-vars' into maint
X-Git-Tag: v2.8.2~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7488c2f65a029246c350b6e89484455a2249fe98?ds=inline;hp=-c

Merge branch 'jk/rev-parse-local-env-vars' into maint

The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.

* jk/rev-parse-local-env-vars:
rev-parse: let some options run outside repository
t1515: add tests for rev-parse out-of-repo helpers
---

7488c2f65a029246c350b6e89484455a2249fe98
diff --combined builtin/rev-parse.c
index cf8487b3b9,3116d29d83..c961b74c5a
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@@ -383,7 -383,7 +383,7 @@@ static int cmd_parseopt(int argc, cons
  
  	/* get the usage up to the first line with a -- on it */
  	for (;;) {
 -		if (strbuf_getline(&sb, stdin, '\n') == EOF)
 +		if (strbuf_getline(&sb, stdin) == EOF)
  			die("premature end of input");
  		ALLOC_GROW(usage, unb + 1, usz);
  		if (!strcmp("--", sb.buf)) {
@@@ -396,7 -396,7 +396,7 @@@
  	}
  
  	/* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
 -	while (strbuf_getline(&sb, stdin, '\n') != EOF) {
 +	while (strbuf_getline(&sb, stdin) != EOF) {
  		const char *s;
  		const char *help;
  		struct option *o;
@@@ -505,6 -505,7 +505,7 @@@ N_("git rev-parse --parseopt [<options>
  int cmd_rev_parse(int argc, const char **argv, const char *prefix)
  {
  	int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
+ 	int did_repo_setup = 0;
  	int has_dashdash = 0;
  	int output_prefix = 0;
  	unsigned char sha1[20];
@@@ -528,11 -529,40 +529,40 @@@
  		}
  	}
  
- 	prefix = setup_git_directory();
- 	git_config(git_default_config, NULL);
+ 	/* No options; just report on whether we're in a git repo or not. */
+ 	if (argc == 1) {
+ 		setup_git_directory();
+ 		git_config(git_default_config, NULL);
+ 		return 0;
+ 	}
+ 
  	for (i = 1; i < argc; i++) {
  		const char *arg = argv[i];
  
+ 		if (!strcmp(arg, "--local-env-vars")) {
+ 			int i;
+ 			for (i = 0; local_repo_env[i]; i++)
+ 				printf("%s\n", local_repo_env[i]);
+ 			continue;
+ 		}
+ 		if (!strcmp(arg, "--resolve-git-dir")) {
+ 			const char *gitdir = argv[++i];
+ 			if (!gitdir)
+ 				die("--resolve-git-dir requires an argument");
+ 			gitdir = resolve_gitdir(gitdir);
+ 			if (!gitdir)
+ 				die("not a gitdir '%s'", argv[i]);
+ 			puts(gitdir);
+ 			continue;
+ 		}
+ 
+ 		/* The rest of the options require a git repository. */
+ 		if (!did_repo_setup) {
+ 			prefix = setup_git_directory();
+ 			git_config(git_default_config, NULL);
+ 			did_repo_setup = 1;
+ 		}
+ 
  		if (!strcmp(arg, "--git-path")) {
  			if (!argv[i + 1])
  				die("--git-path requires an argument");
@@@ -706,12 -736,6 +736,6 @@@
  				add_ref_exclusion(&ref_excludes, arg + 10);
  				continue;
  			}
- 			if (!strcmp(arg, "--local-env-vars")) {
- 				int i;
- 				for (i = 0; local_repo_env[i]; i++)
- 					printf("%s\n", local_repo_env[i]);
- 				continue;
- 			}
  			if (!strcmp(arg, "--show-toplevel")) {
  				const char *work_tree = get_git_work_tree();
  				if (work_tree)
@@@ -763,20 -787,9 +787,10 @@@
  				continue;
  			}
  			if (!strcmp(arg, "--git-common-dir")) {
 -				puts(get_git_common_dir());
 +				const char *pfx = prefix ? prefix : "";
 +				puts(prefix_filename(pfx, strlen(pfx), get_git_common_dir()));
  				continue;
  			}
- 			if (!strcmp(arg, "--resolve-git-dir")) {
- 				const char *gitdir = argv[++i];
- 				if (!gitdir)
- 					die("--resolve-git-dir requires an argument");
- 				gitdir = resolve_gitdir(gitdir);
- 				if (!gitdir)
- 					die("not a gitdir '%s'", argv[i]);
- 				puts(gitdir);
- 				continue;
- 			}
  			if (!strcmp(arg, "--is-inside-git-dir")) {
  				printf("%s\n", is_inside_git_dir() ? "true"
  						: "false");