Merge branch 'misc-patches'

j6t · j6t · commit 1e822566fda3 · 2025-10-17T10:43:32.000+02:00
# Conflicts:
#	compat/mingw.c
diff --git a/Makefile b/Makefile
@@ -3667,6 +3667,13 @@ endif
 		  ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 		  ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 		  cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; } \
+	done && \
+	remote_curl_names="$(REMOTE_CURL_NAMES)" && \
+	for p in $$remote_curl_names; do \
+		$(RM) "$$bindir/$$p" && \
+		{ ln "$$execdir/$$p" "$$bindir/$$p" 2>/dev/null || \
+		  ln -s "$$execdir/$$p" "$$bindir/$$p" 2>/dev/null || \
+		  cp "$$execdir/$$p" "$$bindir/$$p" || exit; } \
 	done
 
 .PHONY: install-doc install-man install-man-perl install-html install-info install-pdf
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
@@ -48,6 +48,14 @@ static const char *parse_arg(const char *next, struct strbuf *arg)
 	return next;
 }
 
+static const char *skip_trailing_space(const char *next)
+{
+	if (line_termination)
+		while (*next && *next != line_termination && isspace(*next))
+			next++;
+	return next;
+}
+
 /*
  * Parse the reference name immediately after "command SP".  If not
  * -z, then handle C-quoting.  Return a pointer to a newly allocated
@@ -264,6 +272,7 @@ static void parse_cmd_update(struct ref_transaction *transaction,
 	have_old = !parse_next_oid(&next, end, &old_oid, "update", refname,
 				   PARSE_SHA1_OLD);
 
+	next = skip_trailing_space(next);
 	if (*next != line_termination)
 		die("update %s: extra input: %s", refname, next);
 
@@ -352,6 +361,7 @@ static void parse_cmd_create(struct ref_transaction *transaction,
 	if (is_null_oid(&new_oid))
 		die("create %s: zero <new-oid>", refname);
 
+	next = skip_trailing_space(next);
 	if (*next != line_termination)
 		die("create %s: extra input: %s", refname, next);
 
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -244,7 +244,7 @@ enum hide_dotfiles_type {
 	HIDE_DOTFILES_DOTGITONLY
 };
 
-static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
+static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_FALSE;
 static char *unset_environment_variables;
 
 int mingw_core_config(const char *var, const char *value,
@@ -2777,7 +2777,7 @@ static void setup_windows_environment(void)
 
 	/* simulate TERM to enable auto-color (see color.c) */
 	if (!getenv("TERM"))
-		setenv("TERM", "cygwin", 1);
+		setenv("TERM", "xterm-256color", 1);
 
 	/* calculate HOME if not set */
 	if (!getenv("HOME")) {
diff --git a/compat/snprintf.c b/compat/snprintf.c
@@ -22,6 +22,7 @@ int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap)
 	va_list cp;
 	char *s;
 	int ret = -1;
+	int save_errno = errno;
 
 	if (maxsize > 0) {
 		va_copy(cp, ap);
@@ -33,7 +34,7 @@ int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap)
 		str[maxsize-1] = 0;
 	}
 	if (ret != -1)
-		return ret;
+		goto out;
 
 	s = NULL;
 	if (maxsize < 128)
@@ -42,8 +43,10 @@ int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap)
 	while (ret == -1) {
 		maxsize *= 4;
 		str = realloc(s, maxsize);
-		if (! str)
+		if (!str) {
+			save_errno = ENOMEM;
 			break;
+		}
 		s = str;
 		va_copy(cp, ap);
 		ret = vsnprintf(str, maxsize-SNPRINTF_SIZE_CORR, format, cp);
@@ -52,6 +55,8 @@ int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap)
 			ret = -1;
 	}
 	free(s);
+out:
+	errno = save_errno;
 	return ret;
 }
 
diff --git a/path.c b/path.c
@@ -1436,17 +1436,19 @@ int daemon_avoid_alias(const char *p)
 	 * be true as long as dots continue after that without intervening
 	 * non-dot character.
 	 */
-	if (!p || (*p != '/' && *p != '~'))
+	if (!p || (!is_absolute_path(p) && *p != '~'))
 		return -1;
 	sl = 1; ndot = 0;
+	if (has_dos_drive_prefix(p))
+		p += 2;
 	p++;
 
 	while (1) {
 		char ch = *p++;
 		if (sl) {
 			if (ch == '.')
 				ndot++;
-			else if (ch == '/') {
+			else if (is_dir_sep(ch)) {
 				if (ndot < 3)
 					/* reject //, /./ and /../ */
 					return -1;
@@ -1463,7 +1465,7 @@ int daemon_avoid_alias(const char *p)
 		}
 		else if (ch == 0)
 			return 0;
-		else if (ch == '/') {
+		else if (is_dir_sep(ch)) {
 			sl = 1;
 			ndot = 0;
 		}
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
@@ -463,14 +463,14 @@ test_expect_success 're-init to move gitdir within linked worktree (relative)' '
 	sep_git_dir_worktree linkwt relative
 '
 
-test_expect_success MINGW '.git hidden' '
+test_expect_success MINGW '.git not hidden' '
 	rm -rf newdir &&
 	(
 		sane_unset GIT_DIR GIT_WORK_TREE &&
 		mkdir newdir &&
 		cd newdir &&
 		git init &&
-		test_path_is_hidden .git
+		! test_path_is_hidden .git
 	) &&
 	check_config newdir/.git false unset
 '
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
@@ -13,7 +13,7 @@ obj_to_file() {
 corrupt_byte() {
 	obj_file=$(obj_to_file "$1") &&
 	chmod +w "$obj_file" &&
-	printf '\0' | dd of="$obj_file" bs=1 seek="$2" conv=notrunc
+	printf '\0' | test_overwrite_bytes "$obj_file" "$2"
 }
 
 test_expect_success 'setup corrupt repo' '
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
@@ -629,7 +629,7 @@ test_expect_success 'stdin fails create with no new value' '
 test_expect_success 'stdin fails create with too many arguments' '
 	echo "create $a $m $m" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create $a: extra input:  $m" err
+	grep "fatal: create $a: extra input: $m" err
 '
 
 test_expect_success 'stdin fails update with no ref' '
@@ -647,7 +647,7 @@ test_expect_success 'stdin fails update with no new value' '
 test_expect_success 'stdin fails update with too many arguments' '
 	echo "update $a $m $m $m" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: update $a: extra input:  $m" err
+	grep "fatal: update $a: extra input: $m" err
 '
 
 test_expect_success 'stdin fails delete with no ref' '
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
@@ -161,6 +161,7 @@ test_expect_success 'drop middle stash' '
 	git reset --hard &&
 	echo 8 >file &&
 	git stash &&
+	sleep 1 &&
 	echo 9 >file &&
 	git stash &&
 	git stash drop stash@{1} &&
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
@@ -290,7 +290,7 @@ test_expect_success 'verify-pack catches mismatched .idx and .pack files' '
 
 test_expect_success 'verify-pack catches a corrupted pack signature' '
 	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
+	echo | test_overwrite_bytes test-3.pack 2 &&
 	if git verify-pack test-3.idx
 	then false
 	else :;
@@ -299,7 +299,7 @@ test_expect_success 'verify-pack catches a corrupted pack signature' '
 
 test_expect_success 'verify-pack catches a corrupted pack version' '
 	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
+	echo | test_overwrite_bytes test-3.pack 7 &&
 	if git verify-pack test-3.idx
 	then false
 	else :;
@@ -308,7 +308,7 @@ test_expect_success 'verify-pack catches a corrupted pack version' '
 
 test_expect_success 'verify-pack catches a corrupted type/size of the 1st packed object data' '
 	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
+	echo | test_overwrite_bytes test-3.pack 12 &&
 	if git verify-pack test-3.idx
 	then false
 	else :;
@@ -319,7 +319,7 @@ test_expect_success 'verify-pack catches a corrupted sum of the index file itsel
 	l=$(wc -c <test-3.idx) &&
 	l=$(expr $l - 20) &&
 	cat test-1-${packname_1}.pack >test-3.pack &&
-	printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
+	printf "%20s" "" | test_overwrite_bytes test-3.idx $l &&
 	if git verify-pack test-3.pack
 	then false
 	else :;
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
@@ -236,8 +236,9 @@ test_expect_success \
 	obj=$(git hash-object file_001) &&
 	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
 	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
-	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
-		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
+	printf xxxx |
+		test_overwrite_bytes ".git/objects/pack/pack-${pack1}.idx" \
+			$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
 	 ( while read obj
 	   do git cat-file -p $obj >/dev/null || exit 1
 	   done <obj-list ) &&
diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh
@@ -57,7 +57,7 @@ do_corrupt_object() {
     ofs=$(git show-index < ${pack}.idx | grep $1 | cut -f1 -d" ") &&
     ofs=$(($ofs + $2)) &&
     chmod +w ${pack}.pack &&
-    dd of=${pack}.pack bs=1 conv=notrunc seek=$ofs &&
+    test_overwrite_bytes "${pack}.pack" "$ofs" &&
     test_must_fail git verify-pack ${pack}.pack
 }
 
diff --git a/t/t5313-pack-bounds-checks.sh b/t/t5313-pack-bounds-checks.sh
@@ -28,7 +28,7 @@ do_pack () {
 }
 
 munge () {
-	printf "$3" | dd of="$1" bs=1 conv=notrunc seek=$2
+	printf "$3" | test_overwrite_bytes "$1" "$2"
 }
 
 # Offset in a v2 .idx to its initial and extended offset tables. For an index
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
@@ -19,7 +19,7 @@ fi
 
 UNCPATH="$(winpwd)"
 case "$UNCPATH" in
-[A-Z]:*)
+[A-Za-z]:*)
 	# Use administrative share e.g. \\localhost\C$\git-sdk-64\usr\src\git
 	# (we use forward slashes here because MSYS2 and Git accept them, and
 	# they are easier on the eyes)
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
@@ -150,7 +150,8 @@ EOF
 test_expect_success 'commit message from template with whitespace issue' '
 	echo "content galore" >>foo &&
 	git add foo &&
-	GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
+	TEST_DIRECTORY="$TEST_DIRECTORY" \
+	GIT_EDITOR="\$TEST_DIRECTORY"/t7500/add-whitespaced-content \
 	git commit --template "$TEMPLATE" &&
 	commit_msg_is "commit message"
 '
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
@@ -1618,6 +1618,22 @@ test_skip_or_die () {
 	error "$2"
 }
 
+# Overwrite bytes at an offset in a file
+# $1 ... the file to modify
+# $2 ... byte offset into file
+# stdin ... new bytes
+test_overwrite_bytes () {
+	perl -e '
+		$fname = shift @ARGV;
+		$offset = shift @ARGV;
+		$bytes = <>;
+		open my $fh, "+<", $fname	or die "open $fname: $!\n";
+		seek($fh, $offset, 0)		or die "seek $fname: $!\n";
+		syswrite($fh, $bytes)		or die "write $fname: $!\n";
+		close $fh			or die "close $fname: $!\n";
+	' "$@"
+}
+
 # Like "env FOO=BAR some-program", but run inside a subshell, which means
 # it also works for shell functions (though those functions cannot impact
 # the environment outside of the test_env invocation).
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -607,6 +607,20 @@ u200c=$(printf '\342\200\214')
 
 export _x05 _x35 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX
 
+if ! command -v tput >/dev/null
+then
+	tput () {
+		case "$1" in
+		bold)
+			printf "\033[1m" ;;
+		setaf)
+			printf "\033[0;3$2m" ;;
+		sgr0)
+			printf "\033(\033[m" ;;
+		esac
+	}
+fi
+
 test "x$TERM" != "xdumb" && (
 		test -t 1 &&
 		tput bold >/dev/null 2>&1 &&

Original file line number	Diff line number	Diff line change
`@@ -463,14 +463,14 @@ test_expect_success 're-init to move gitdir within linked worktree (relative)' '`
`463`	`463`	`sep_git_dir_worktree linkwt relative`
`464`	`464`	`'`
`465`	`465`
`466`		`-test_expect_success MINGW '.git hidden' '`
	`466`	`+test_expect_success MINGW '.git not hidden' '`
`467`	`467`	`rm -rf newdir &&`
`468`	`468`	`(`
`469`	`469`	`sane_unset GIT_DIR GIT_WORK_TREE &&`
`470`	`470`	`mkdir newdir &&`
`471`	`471`	`cd newdir &&`
`472`	`472`	`git init &&`
`473`		`- test_path_is_hidden .git`
	`473`	`+ ! test_path_is_hidden .git`
`474`	`474`	`) &&`
`475`	`475`	`check_config newdir/.git false unset`
`476`	`476`	`'`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ obj_to_file() {`
`13`	`13`	`corrupt_byte() {`
`14`	`14`	`obj_file=$(obj_to_file "$1") &&`
`15`	`15`	`chmod +w "$obj_file" &&`
`16`		`- printf '\0' \| dd of="$obj_file" bs=1 seek="$2" conv=notrunc`
	`16`	`+ printf '\0' \| test_overwrite_bytes "$obj_file" "$2"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`test_expect_success 'setup corrupt repo' '`