From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:33:58 +0000 (-0800)
Subject: Merge branch 'as/ll-i18n'
X-Git-Tag: v2.17.0-rc0~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4053966ea71a9f6460419fd68db912bda91ff85?hp=-c

Merge branch 'as/ll-i18n'

Some messages in low level start-up codepath have been i18n-ized.

* as/ll-i18n:
Mark messages for translations
---

d4053966ea71a9f6460419fd68db912bda91ff85
diff --combined setup.c
index c5d55dcee4,16e7a6bb4c..7287779642
--- a/setup.c
+++ b/setup.c
@@@ -119,7 -119,7 +119,7 @@@ char *prefix_path(const char *prefix, i
  {
  	char *r = prefix_path_gently(prefix, len, NULL, path);
  	if (!r)
- 		die("'%s' is outside repository", path);
+ 		die(_("'%s' is outside repository"), path);
  	return r;
  }
  
@@@ -160,7 -160,7 +160,7 @@@ int check_filename(const char *prefix, 
  		free(to_free);
  		return 0; /* file does not exist */
  	}
- 	die_errno("failed to stat '%s'", arg);
+ 	die_errno(_("failed to stat '%s'"), arg);
  }
  
  static void NORETURN die_verify_filename(const char *prefix,
@@@ -230,7 -230,7 +230,7 @@@ void verify_filename(const char *prefix
  		     int diagnose_misspelt_rev)
  {
  	if (*arg == '-')
- 		die("option '%s' must come before non-option arguments", arg);
+ 		die(_("option '%s' must come before non-option arguments"), arg);
  	if (looks_like_pathspec(arg) || check_filename(prefix, arg))
  		return;
  	die_verify_filename(prefix, arg, diagnose_misspelt_rev);
@@@ -385,14 -385,14 +385,14 @@@ void setup_work_tree(void
  		return;
  
  	if (work_tree_config_is_bogus)
- 		die("unable to set up work tree using invalid config");
+ 		die(_("unable to set up work tree using invalid config"));
  
  	work_tree = get_git_work_tree();
  	git_dir = get_git_dir();
  	if (!is_absolute_path(git_dir))
  		git_dir = real_path(get_git_dir());
  	if (!work_tree || chdir(work_tree))
- 		die("This operation must be run in a work tree");
+ 		die(_("this operation must be run in a work tree"));
  
  	/*
  	 * Make sure subsequent git processes find correct worktree
@@@ -422,11 -422,7 +422,11 @@@ static int check_repo_format(const cha
  			;
  		else if (!strcmp(ext, "preciousobjects"))
  			data->precious_objects = git_config_bool(var, value);
 -		else
 +		else if (!strcmp(ext, "partialclone")) {
 +			if (!value)
 +				return config_error_nonbool(var);
 +			data->partial_clone = xstrdup(value);
 +		} else
  			string_list_append(&data->unknown_extensions, ext);
  	} else if (strcmp(var, "core.bare") == 0) {
  		data->is_bare = git_config_bool(var, value);
@@@ -468,7 -464,6 +468,7 @@@ static int check_repository_format_gent
  	}
  
  	repository_format_precious_objects = candidate->precious_objects;
 +	repository_format_partial_clone = candidate->partial_clone;
  	string_list_clear(&candidate->unknown_extensions, 0);
  	if (!has_common) {
  		if (candidate->is_bare != -1) {
@@@ -530,17 -525,17 +530,17 @@@ void read_gitfile_error_die(int error_c
  		/* non-fatal; follow return path */
  		break;
  	case READ_GITFILE_ERR_OPEN_FAILED:
- 		die_errno("Error opening '%s'", path);
+ 		die_errno(_("error opening '%s'"), path);
  	case READ_GITFILE_ERR_TOO_LARGE:
- 		die("Too large to be a .git file: '%s'", path);
+ 		die(_("too large to be a .git file: '%s'"), path);
  	case READ_GITFILE_ERR_READ_FAILED:
- 		die("Error reading %s", path);
+ 		die(_("error reading %s"), path);
  	case READ_GITFILE_ERR_INVALID_FORMAT:
- 		die("Invalid gitfile format: %s", path);
+ 		die(_("invalid gitfile format: %s"), path);
  	case READ_GITFILE_ERR_NO_PATH:
- 		die("No path in gitfile: %s", path);
+ 		die(_("no path in gitfile: %s"), path);
  	case READ_GITFILE_ERR_NOT_A_REPO:
- 		die("Not a git repository: %s", dir);
+ 		die(_("not a git repository: %s"), dir);
  	default:
  		die("BUG: unknown error code");
  	}
@@@ -639,7 -634,7 +639,7 @@@ static const char *setup_explicit_git_d
  	int offset;
  
  	if (PATH_MAX - 40 < strlen(gitdirenv))
- 		die("'$%s' too big", GIT_DIR_ENVIRONMENT);
+ 		die(_("'$%s' too big"), GIT_DIR_ENVIRONMENT);
  
  	gitfile = (char*)read_gitfile(gitdirenv);
  	if (gitfile) {
@@@ -653,7 -648,7 +653,7 @@@
  			free(gitfile);
  			return NULL;
  		}
- 		die("Not a git repository: '%s'", gitdirenv);
+ 		die(_("not a git repository: '%s'"), gitdirenv);
  	}
  
  	if (check_repository_format_gently(gitdirenv, repo_fmt, nongit_ok)) {
@@@ -682,12 -677,12 +682,12 @@@
  		else {
  			char *core_worktree;
  			if (chdir(gitdirenv))
- 				die_errno("Could not chdir to '%s'", gitdirenv);
+ 				die_errno(_("cannot chdir to '%s'"), gitdirenv);
  			if (chdir(git_work_tree_cfg))
- 				die_errno("Could not chdir to '%s'", git_work_tree_cfg);
+ 				die_errno(_("cannot chdir to '%s'"), git_work_tree_cfg);
  			core_worktree = xgetcwd();
  			if (chdir(cwd->buf))
- 				die_errno("Could not come back to cwd");
+ 				die_errno(_("cannot come back to cwd"));
  			set_git_work_tree(core_worktree);
  			free(core_worktree);
  		}
@@@ -715,7 -710,7 +715,7 @@@
  	if (offset >= 0) {	/* cwd inside worktree? */
  		set_git_dir(real_path(gitdirenv));
  		if (chdir(worktree))
- 			die_errno("Could not chdir to '%s'", worktree);
+ 			die_errno(_("cannot chdir to '%s'"), worktree);
  		strbuf_addch(cwd, '/');
  		free(gitfile);
  		return cwd->buf + offset;
@@@ -743,7 -738,7 +743,7 @@@ static const char *setup_discovered_git
  		if (offset != cwd->len && !is_absolute_path(gitdir))
  			gitdir = to_free = real_pathdup(gitdir, 1);
  		if (chdir(cwd->buf))
- 			die_errno("Could not come back to cwd");
+ 			die_errno(_("cannot come back to cwd"));
  		ret = setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
  		free(to_free);
  		return ret;
@@@ -753,7 -748,7 +753,7 @@@
  	if (is_bare_repository_cfg > 0) {
  		set_git_dir(offset == cwd->len ? gitdir : real_path(gitdir));
  		if (chdir(cwd->buf))
- 			die_errno("Could not come back to cwd");
+ 			die_errno(_("cannot come back to cwd"));
  		return NULL;
  	}
  
@@@ -792,7 -787,7 +792,7 @@@ static const char *setup_bare_git_dir(s
  
  		gitdir = offset == cwd->len ? "." : xmemdupz(cwd->buf, offset);
  		if (chdir(cwd->buf))
- 			die_errno("Could not come back to cwd");
+ 			die_errno(_("cannot come back to cwd"));
  		return setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
  	}
  
@@@ -800,7 -795,7 +800,7 @@@
  	inside_work_tree = 0;
  	if (offset != cwd->len) {
  		if (chdir(cwd->buf))
- 			die_errno("Cannot come back to cwd");
+ 			die_errno(_("cannot come back to cwd"));
  		root_len = offset_1st_component(cwd->buf);
  		strbuf_setlen(cwd, offset > root_len ? offset : root_len);
  		set_git_dir(cwd->buf);
@@@ -813,9 -808,9 +813,9 @@@
  static const char *setup_nongit(const char *cwd, int *nongit_ok)
  {
  	if (!nongit_ok)
- 		die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
+ 		die(_("not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
  	if (chdir(cwd))
- 		die_errno(_("Cannot come back to cwd"));
+ 		die_errno(_("cannot come back to cwd"));
  	*nongit_ok = 1;
  	return NULL;
  }
@@@ -824,7 -819,7 +824,7 @@@ static dev_t get_device_or_die(const ch
  {
  	struct stat buf;
  	if (stat(path, &buf)) {
- 		die_errno("failed to stat '%*s%s%s'",
+ 		die_errno(_("failed to stat '%*s%s%s'"),
  				prefix_len,
  				prefix ? prefix : "",
  				prefix ? "/" : "", path);
@@@ -1066,13 -1061,13 +1066,13 @@@ const char *setup_git_directory_gently(
  		break;
  	case GIT_DIR_DISCOVERED:
  		if (dir.len < cwd.len && chdir(dir.buf))
- 			die(_("Cannot change to '%s'"), dir.buf);
+ 			die(_("cannot change to '%s'"), dir.buf);
  		prefix = setup_discovered_git_dir(gitdir.buf, &cwd, dir.len,
  						  &repo_fmt, nongit_ok);
  		break;
  	case GIT_DIR_BARE:
  		if (dir.len < cwd.len && chdir(dir.buf))
- 			die(_("Cannot change to '%s'"), dir.buf);
+ 			die(_("cannot change to '%s'"), dir.buf);
  		prefix = setup_bare_git_dir(&cwd, dir.len, &repo_fmt, nongit_ok);
  		break;
  	case GIT_DIR_HIT_CEILING:
@@@ -1085,7 -1080,7 +1085,7 @@@
  			strbuf_release(&dir);
  			return NULL;
  		}
- 		die(_("Not a git repository (or any parent up to mount point %s)\n"
+ 		die(_("not a git repository (or any parent up to mount point %s)\n"
  		      "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
  		    dir.buf);
  	default:
@@@ -1169,7 -1164,7 +1169,7 @@@ int git_config_perm(const char *var, co
  	/* A filemode value was given: 0xxx */
  
  	if ((i & 0600) != 0600)
- 		die(_("Problem with core.sharedRepository filemode value "
+ 		die(_("problem with core.sharedRepository filemode value "
  		    "(0%.3o).\nThe owner of files must always have "
  		    "read and write permissions."), i);
  
@@@ -1212,7 -1207,7 +1212,7 @@@ void sanitize_stdfds(void
  	while (fd != -1 && fd < 2)
  		fd = dup(fd);
  	if (fd == -1)
- 		die_errno("open /dev/null or dup failed");
+ 		die_errno(_("open /dev/null or dup failed"));
  	if (fd > 2)
  		close(fd);
  }
@@@ -1227,12 -1222,12 +1227,12 @@@ int daemonize(void
  		case 0:
  			break;
  		case -1:
- 			die_errno("fork failed");
+ 			die_errno(_("fork failed"));
  		default:
  			exit(0);
  	}
  	if (setsid() == -1)
- 		die_errno("setsid failed");
+ 		die_errno(_("setsid failed"));
  	close(0);
  	close(1);
  	close(2);
diff --combined t/t0002-gitfile.sh
index fb8d094117,797dcf95b7..3691023d51
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@@ -10,6 -10,15 +10,6 @@@ objpath() 
  	echo "$1" | sed -e 's|\(..\)|\1/|'
  }
  
 -objck() {
 -	p=$(objpath "$1")
 -	if test ! -f "$REAL/objects/$p"
 -	then
 -		echo "Object not found: $REAL/objects/$p"
 -		false
 -	fi
 -}
 -
  test_expect_success 'initial setup' '
  	REAL="$(pwd)/.real" &&
  	mv .git "$REAL"
@@@ -17,14 -26,30 +17,14 @@@
  
  test_expect_success 'bad setup: invalid .git file format' '
  	echo "gitdir $REAL" >.git &&
 -	if git rev-parse 2>.err
 -	then
 -		echo "git rev-parse accepted an invalid .git file"
 -		false
 -	fi &&
 -	if ! test_i18ngrep "invalid gitfile format" .err
 -	then
 -		echo "git rev-parse returned wrong error"
 -		false
 -	fi
 +	test_must_fail git rev-parse 2>.err &&
- 	grep "Invalid gitfile format" .err
++	test_i18ngrep "invalid gitfile format" .err
  '
  
  test_expect_success 'bad setup: invalid .git file path' '
  	echo "gitdir: $REAL.not" >.git &&
 -	if git rev-parse 2>.err
 -	then
 -		echo "git rev-parse accepted an invalid .git file path"
 -		false
 -	fi &&
 -	if ! test_i18ngrep "not a git repository" .err
 -	then
 -		echo "git rev-parse returned wrong error"
 -		false
 -	fi
 +	test_must_fail git rev-parse 2>.err &&
- 	grep "Not a git repository" .err
++	test_i18ngrep "not a git repository" .err
  '
  
  test_expect_success 'final setup + check rev-parse --git-dir' '
@@@ -35,7 -60,7 +35,7 @@@
  test_expect_success 'check hash-object' '
  	echo "foo" >bar &&
  	SHA=$(cat bar | git hash-object -w --stdin) &&
 -	objck $SHA
 +	test_path_is_file "$REAL/objects/$(objpath $SHA)"
  '
  
  test_expect_success 'check cat-file' '
@@@ -44,21 -69,29 +44,21 @@@
  '
  
  test_expect_success 'check update-index' '
 -	if test -f "$REAL/index"
 -	then
 -		echo "Hmm, $REAL/index exists?"
 -		false
 -	fi &&
 +	test_path_is_missing "$REAL/index" &&
  	rm -f "$REAL/objects/$(objpath $SHA)" &&
  	git update-index --add bar &&
 -	if ! test -f "$REAL/index"
 -	then
 -		echo "$REAL/index not found"
 -		false
 -	fi &&
 -	objck $SHA
 +	test_path_is_file "$REAL/index" &&
 +	test_path_is_file "$REAL/objects/$(objpath $SHA)"
  '
  
  test_expect_success 'check write-tree' '
  	SHA=$(git write-tree) &&
 -	objck $SHA
 +	test_path_is_file "$REAL/objects/$(objpath $SHA)"
  '
  
  test_expect_success 'check commit-tree' '
  	SHA=$(echo "commit bar" | git commit-tree $SHA) &&
 -	objck $SHA
 +	test_path_is_file "$REAL/objects/$(objpath $SHA)"
  '
  
  test_expect_success 'check rev-list' '
diff --combined t/t0008-ignores.sh
index 54a4703ef1,5743b482f2..c03f155a35
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@@ -307,7 -307,7 +307,7 @@@ test_expect_success_multi 'needs work t
  		cd .git &&
  		test_check_ignore "foo" 128
  	) &&
- 	stderr_contains "fatal: This operation must be run in a work tree"
+ 	stderr_contains "fatal: this operation must be run in a work tree"
  '
  
  ############################################################################
@@@ -775,26 -775,6 +775,26 @@@ test_expect_success PIPE 'streaming sup
  	echo "$response" | grep "^::	two"
  '
  
 +test_expect_success 'existing file and directory' '
 +	test_when_finished "rm one" &&
 +	test_when_finished "rmdir top-level-dir" &&
 +	>one &&
 +	mkdir top-level-dir &&
 +	git check-ignore one top-level-dir >actual &&
 +	grep one actual &&
 +	grep top-level-dir actual
 +'
 +
 +test_expect_success 'existing directory and file' '
 +	test_when_finished "rm one" &&
 +	test_when_finished "rmdir top-level-dir" &&
 +	>one &&
 +	mkdir top-level-dir &&
 +	git check-ignore top-level-dir one >actual &&
 +	grep one actual &&
 +	grep top-level-dir actual
 +'
 +
  ############################################################################
  #
  # test whitespace handling