From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2013 05:29:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c91a6f302d8bea90f3bf4b9e8cffb1cf494f91b?ds=sidebyside;hp=-c

Merge branch 'maint'

* maint:
Translate git_more_info_string consistently
---

0c91a6f302d8bea90f3bf4b9e8cffb1cf494f91b
diff --combined git.c
index b10c18b041,e484644897..86c4432db5
--- a/git.c
+++ b/git.c
@@@ -135,14 -135,6 +135,14 @@@ static int handle_options(const char **
  			git_config_push_parameter((*argv)[1]);
  			(*argv)++;
  			(*argc)--;
 +		} else if (!strcmp(cmd, "--literal-pathspecs")) {
 +			setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "1", 1);
 +			if (envchanged)
 +				*envchanged = 1;
 +		} else if (!strcmp(cmd, "--no-literal-pathspecs")) {
 +			setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "0", 1);
 +			if (envchanged)
 +				*envchanged = 1;
  		} else {
  			fprintf(stderr, "Unknown option: %s\n", cmd);
  			usage(git_usage_string);
@@@ -313,7 -305,6 +313,7 @@@ static void handle_internal_command(in
  		{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "check-attr", cmd_check_attr, RUN_SETUP },
 +		{ "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE },
  		{ "check-ref-format", cmd_check_ref_format },
  		{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
  		{ "checkout-index", cmd_checkout_index,
@@@ -545,7 -536,7 +545,7 @@@ int main(int argc, const char **argv
  		commit_pager_choice();
  		printf("usage: %s\n\n", git_usage_string);
  		list_common_cmds_help();
- 		printf("\n%s\n", git_more_info_string);
+ 		printf("\n%s\n", _(git_more_info_string));
  		exit(1);
  	}
  	cmd = argv[0];