merge and conflict resolution from vs/master

maplion · maplion · commit bb15d03a2edf · 2018-01-22T22:31:53.000-07:00
diff --git a/Documentation/RelNotes/2.16.1.txt b/Documentation/RelNotes/2.16.1.txt
@@ -0,0 +1,11 @@
+Git v2.16.1 Release Notes
+=========================
+
+Fixes since v2.16
+-----------------
+
+ * "git clone" segfaulted when cloning a project that happens to
+   track two paths that differ only in case on a case insensitive
+   filesystem.
+
+Does not contain any other documentation updates or code clean-ups.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.16.0
+DEF_VER=v2.16.1
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.16.0.txt
+Documentation/RelNotes/2.16.1.txt
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -359,7 +359,6 @@ static int checkout_paths(const struct checkout_opts *opts,
 	state.istate = &the_index;
 
 	enable_delayed_checkout(&state);
-	enable_fscache(1);
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -374,7 +373,6 @@ static int checkout_paths(const struct checkout_opts *opts,
 			pos = skip_same_name(ce, pos) - 1;
 		}
 	}
-	enable_fscache(0);
 	errs |= finish_delayed_checkout(&state);
 
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
diff --git a/builtin/reset.c b/builtin/reset.c
@@ -52,7 +52,6 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
 	struct tree *tree;
 	struct unpack_trees_options opts;
 	int ret = -1;
-	int unpack_result;
 
 	memset(&opts, 0, sizeof(opts));
 	opts.head_idx = 1;
@@ -92,11 +91,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
 	}
 	nr++;
 
-	enable_fscache(1);
-	unpack_result = unpack_trees(nr, desc, &opts);
-	enable_fscache(0);
-
-	if (unpack_result)
+	if (unpack_trees(nr, desc, &opts))
 		goto out;
 
 	if (reset_type == MIXED || reset_type == HARD) {
diff --git a/git-cvsserver b/git-cvsserver
@@ -27,7 +27,7 @@ use File::Path qw/rmtree/;
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '2.15.1.windows.2.1430.ga56c4f9e2a.dirty.MSVC';
+my $VERSION = '2.16.0.windows.2.1027.g1a4ee4d5d8.dirty.MSVC';
 
 my $log = GITCVS::log->new();
 my $cfg;
diff --git a/git-send-email b/git-send-email
@@ -1290,7 +1290,7 @@ sub send_message {
 	@recipients = unique_email_list(@recipients,@cc,@bcclist);
 	@recipients = (map { extract_valid_address_or_die($_) } @recipients);
 	my $date = format_2822_time($time++);
-	my $gitversion = '2.15.1.windows.2.1430.ga56c4f9e2a.dirty.MSVC';
+	my $gitversion = '2.16.0.windows.2.1027.g1a4ee4d5d8.dirty.MSVC';
 	if ($gitversion =~ m/..GIT_VERSION../) {
 	    $gitversion = Git::version();
 	}
diff --git a/git-svn b/git-svn
@@ -9,7 +9,7 @@ use vars qw/	$AUTHOR $VERSION
 		$sha1 $sha1_short $_revision $_repository
 		$_q $_authors $_authors_prog %users/;
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
-$VERSION = '2.15.1.windows.2.1430.ga56c4f9e2a.dirty.MSVC';
+$VERSION = '2.16.0.windows.2.1027.g1a4ee4d5d8.dirty.MSVC';
 
 use Carp qw/croak/;
 use File::Basename qw/dirname basename/;
diff --git a/libgit/libgit.vcxproj b/libgit/libgit.vcxproj
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;BINDIR="bin";DEFAULT_HELP_FORMAT="html";DETECT_MSYS_TTY;ETC_GITATTRIBUTES="etc/gitattributes";ETC_GITCONFIG="etc/gitconfig";FALLBACK_RUNTIME_PREFIX="/mingw64";GAWK;GIT_BUILT_FROM_COMMIT="a56c4f9e2a9513d2be57dc4346e0e84887399cd9";GIT_EXEC_PATH="libexec/git-core";GIT_HOST_CPU="x86_64";GIT_LOCALE_PATH="share/locale";GIT_USER_AGENT="git/2.15.1.windows.2.1430.ga56c4f9e2a.MSVC";GIT_VERSION="2.15.1.windows.2.1430.ga56c4f9e2a.MSVC";HAVE_ALLOCA_H;HAVE_STRING_H;MMAP_PREVENTS_DELETE;NATIVE_CRLF;NDEBUG;NOGDI;NO_GETTEXT;NO_INET_NTOP;NO_INET_PTON;NO_INTTYPES_H;NO_IPV6;NO_LIBGEN_H;NO_MBSUPPORT;NO_MEMMEM;NO_MKDTEMP;NO_POLL;NO_POSIX_GOODIES;NO_PREAD;NO_SETENV;NO_STRCASESTR;NO_STRLCPY;NO_STRTOUMAX;NO_ST_BLOCKS_IN_STRUCT_STAT;NO_SYMLINK_HEAD;NO_SYS_POLL_H;OBJECT_CREATION_MODE=1;PAGER_ENV="LESS=FRX LV=-c";PROTECT_NTFS_DEFAULT=1;RUNTIME_PREFIX;SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h";SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h";SHA1DC_INIT_SAFE_HASH_DEFAULT=0;SHA1DC_NO_STANDARD_INCLUDES;SHA1_DC;SHELL_PATH="/bin/sh";STRIP_EXTENSION=".exe";UNRELIABLE_FSTAT;USE_CURL_FOR_IMAP_SEND;USE_WIN32_MMAP;WIN32;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;__USE_MINGW_ACCESS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;BINDIR="bin";DEFAULT_HELP_FORMAT="html";DETECT_MSYS_TTY;ETC_GITATTRIBUTES="etc/gitattributes";ETC_GITCONFIG="etc/gitconfig";FALLBACK_RUNTIME_PREFIX="/mingw64";GAWK;GIT_BUILT_FROM_COMMIT="1a4ee4d5d83bbba63f6d8b71c427f627769f3386";GIT_EXEC_PATH="libexec/git-core";GIT_HOST_CPU="x86_64";GIT_LOCALE_PATH="share/locale";GIT_USER_AGENT="git/2.16.0.windows.2.1027.g1a4ee4d5d8.MSVC";GIT_VERSION="2.16.0.windows.2.1027.g1a4ee4d5d8.MSVC";HAVE_ALLOCA_H;HAVE_STRING_H;MMAP_PREVENTS_DELETE;NATIVE_CRLF;NDEBUG;NOGDI;NO_GETTEXT;NO_INET_NTOP;NO_INET_PTON;NO_INTTYPES_H;NO_IPV6;NO_LIBGEN_H;NO_MBSUPPORT;NO_MEMMEM;NO_MKDTEMP;NO_POLL;NO_POSIX_GOODIES;NO_PREAD;NO_SETENV;NO_STRCASESTR;NO_STRLCPY;NO_STRTOUMAX;NO_ST_BLOCKS_IN_STRUCT_STAT;NO_SYMLINK_HEAD;NO_SYS_POLL_H;OBJECT_CREATION_MODE=1;PAGER_ENV="LESS=FRX LV=-c";PROTECT_NTFS_DEFAULT=1;RUNTIME_PREFIX;SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h";SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h";SHA1DC_INIT_SAFE_HASH_DEFAULT=0;SHA1DC_NO_STANDARD_INCLUDES;SHA1_DC;SHELL_PATH="/bin/sh";STRIP_EXTENSION=".exe";UNRELIABLE_FSTAT;USE_CURL_FOR_IMAP_SEND;USE_WIN32_MMAP;WIN32;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;__USE_MINGW_ACCESS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -105,7 +105,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;BINDIR="bin";DEFAULT_HELP_FORMAT="html";DETECT_MSYS_TTY;ETC_GITATTRIBUTES="etc/gitattributes";ETC_GITCONFIG="etc/gitconfig";FALLBACK_RUNTIME_PREFIX="/mingw64";GAWK;GIT_BUILT_FROM_COMMIT="a56c4f9e2a9513d2be57dc4346e0e84887399cd9";GIT_EXEC_PATH="libexec/git-core";GIT_HOST_CPU="x86_64";GIT_LOCALE_PATH="share/locale";GIT_USER_AGENT="git/2.15.1.windows.2.1430.ga56c4f9e2a.MSVC";GIT_VERSION="2.15.1.windows.2.1430.ga56c4f9e2a.MSVC";HAVE_ALLOCA_H;HAVE_STRING_H;MMAP_PREVENTS_DELETE;NATIVE_CRLF;NDEBUG;NOGDI;NO_GETTEXT;NO_INET_NTOP;NO_INET_PTON;NO_INTTYPES_H;NO_IPV6;NO_LIBGEN_H;NO_MBSUPPORT;NO_MEMMEM;NO_MKDTEMP;NO_POLL;NO_POSIX_GOODIES;NO_PREAD;NO_SETENV;NO_STRCASESTR;NO_STRLCPY;NO_STRTOUMAX;NO_ST_BLOCKS_IN_STRUCT_STAT;NO_SYMLINK_HEAD;NO_SYS_POLL_H;OBJECT_CREATION_MODE=1;PAGER_ENV="LESS=FRX LV=-c";PROTECT_NTFS_DEFAULT=1;RUNTIME_PREFIX;SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h";SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h";SHA1DC_INIT_SAFE_HASH_DEFAULT=0;SHA1DC_NO_STANDARD_INCLUDES;SHA1_DC;SHELL_PATH="/bin/sh";STRIP_EXTENSION=".exe";UNRELIABLE_FSTAT;USE_CURL_FOR_IMAP_SEND;USE_WIN32_MMAP;WIN32;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;__USE_MINGW_ACCESS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;BINDIR="bin";DEFAULT_HELP_FORMAT="html";DETECT_MSYS_TTY;ETC_GITATTRIBUTES="etc/gitattributes";ETC_GITCONFIG="etc/gitconfig";FALLBACK_RUNTIME_PREFIX="/mingw64";GAWK;GIT_BUILT_FROM_COMMIT="1a4ee4d5d83bbba63f6d8b71c427f627769f3386";GIT_EXEC_PATH="libexec/git-core";GIT_HOST_CPU="x86_64";GIT_LOCALE_PATH="share/locale";GIT_USER_AGENT="git/2.16.0.windows.2.1027.g1a4ee4d5d8.MSVC";GIT_VERSION="2.16.0.windows.2.1027.g1a4ee4d5d8.MSVC";HAVE_ALLOCA_H;HAVE_STRING_H;MMAP_PREVENTS_DELETE;NATIVE_CRLF;NDEBUG;NOGDI;NO_GETTEXT;NO_INET_NTOP;NO_INET_PTON;NO_INTTYPES_H;NO_IPV6;NO_LIBGEN_H;NO_MBSUPPORT;NO_MEMMEM;NO_MKDTEMP;NO_POLL;NO_POSIX_GOODIES;NO_PREAD;NO_SETENV;NO_STRCASESTR;NO_STRLCPY;NO_STRTOUMAX;NO_ST_BLOCKS_IN_STRUCT_STAT;NO_SYMLINK_HEAD;NO_SYS_POLL_H;OBJECT_CREATION_MODE=1;PAGER_ENV="LESS=FRX LV=-c";PROTECT_NTFS_DEFAULT=1;RUNTIME_PREFIX;SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h";SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h";SHA1DC_INIT_SAFE_HASH_DEFAULT=0;SHA1DC_NO_STANDARD_INCLUDES;SHA1_DC;SHELL_PATH="/bin/sh";STRIP_EXTENSION=".exe";UNRELIABLE_FSTAT;USE_CURL_FOR_IMAP_SEND;USE_WIN32_MMAP;WIN32;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;__USE_MINGW_ACCESS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/repository.c b/repository.c
@@ -5,7 +5,7 @@
 
 /* The main repository */
 static struct repository the_repo = {
-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &the_index, NULL, 0, 0
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &the_index, &hash_algos[GIT_HASH_SHA1], 0, 0
 };
 struct repository *the_repository = &the_repo;
 
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -611,4 +611,21 @@ test_expect_success 'GIT_TRACE_PACKFILE produces a usable pack' '
 	git -C replay.git index-pack -v --stdin <tmp.pack
 '
 
+hex2oct () {
+	perl -ne 'printf "\\%03o", hex for /../g'
+}
+
+test_expect_success 'clone on case-insensitive fs' '
+	git init icasefs &&
+	(
+		cd icasefs
+		o=$(git hash-object -w --stdin </dev/null | hex2oct) &&
+		t=$(printf "100644 X\0${o}100644 x\0${o}" |
+			git hash-object -w -t tree --stdin) &&
+		c=$(git commit-tree -m bogus $t) &&
+		git update-ref refs/heads/bogus $c &&
+		git clone -b bogus . bogus
+	)
+'
+
 test_done
diff --git a/templates/boilerplates.made b/templates/boilerplates.made
@@ -1 +1 @@
-Wed, Jan 17, 2018 10:10:00 PM
+Mon, Jan 22, 2018  6:09:51 AM

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`GVF=GIT-VERSION-FILE`
`4`		`-DEF_VER=v2.16.0`
	`4`	`+DEF_VER=v2.16.1`
`5`	`5`
`6`	`6`	`LF='`
`7`	`7`	`'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Documentation/RelNotes/2.16.0.txt`
	`1`	`+Documentation/RelNotes/2.16.1.txt`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,6 @@ static int checkout_paths(const struct checkout_opts *opts,`
`359`	`359`	`state.istate = &the_index;`
`360`	`360`
`361`	`361`	`enable_delayed_checkout(&state);`
`362`		`- enable_fscache(1);`
`363`	`362`	`for (pos = 0; pos < active_nr; pos++) {`
`364`	`363`	`struct cache_entry *ce = active_cache[pos];`
`365`	`364`	`if (ce->ce_flags & CE_MATCHED) {`
`@@ -374,7 +373,6 @@ static int checkout_paths(const struct checkout_opts *opts,`
`374`	`373`	`pos = skip_same_name(ce, pos) - 1;`
`375`	`374`	`}`
`376`	`375`	`}`
`377`		`- enable_fscache(0);`
`378`	`376`	`errs \|= finish_delayed_checkout(&state);`
`379`	`377`
`380`	`378`	`if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))`
Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,7 @@ sub send_message {`
`1290`	`1290`	`@recipients = unique_email_list(@recipients,@cc,@bcclist);`
`1291`	`1291`	`@recipients = (map { extract_valid_address_or_die($_) } @recipients);`
`1292`	`1292`	`my $date = format_2822_time($time++);`
`1293`		`- my $gitversion = '2.15.1.windows.2.1430.ga56c4f9e2a.dirty.MSVC';`
	`1293`	`+ my $gitversion = '2.16.0.windows.2.1027.g1a4ee4d5d8.dirty.MSVC';`
`1294`	`1294`	`if ($gitversion =~ m/..GIT_VERSION../) {`
`1295`	`1295`	`$gitversion = Git::version();`
`1296`	`1296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Wed, Jan 17, 2018 10:10:00 PM`
	`1`	`+Mon, Jan 22, 2018 6:09:51 AM`