Staging
v0.5.2
https://github.com/git/git
Revision d3ac8c3f27a507d0489d18b51d6deba6364a99ce authored by Johannes Schindelin on 04 December 2019, 20:26:31 UTC, committed by Johannes Schindelin on 06 December 2019, 15:26:55 UTC
* maint-2.14: (28 commits)
  Git 2.14.6
  mingw: handle `subst`-ed "DOS drives"
  mingw: refuse to access paths with trailing spaces or periods
  mingw: refuse to access paths with illegal characters
  unpack-trees: let merged_entry() pass through do_add_entry()'s errors
  quote-stress-test: offer to test quoting arguments for MSYS2 sh
  t6130/t9350: prepare for stringent Win32 path validation
  quote-stress-test: allow skipping some trials
  quote-stress-test: accept arguments to test via the command-line
  tests: add a helper to stress test argument quoting
  mingw: fix quoting of arguments
  Disallow dubiously-nested submodule git directories
  protect_ntfs: turn on NTFS protection by default
  path: also guard `.gitmodules` against NTFS Alternate Data Streams
  is_ntfs_dotgit(): speed it up
  mingw: disallow backslash characters in tree objects' file names
  path: safeguard `.git` against NTFS Alternate Streams Accesses
  clone --recurse-submodules: prevent name squatting on Windows
  is_ntfs_dotgit(): only verify the leading segment
  test-path-utils: offer to run a protectNTFS/protectHFS benchmark
  ...
2 parent s 924c623 + 66d2a61
Raw File
Tip revision: d3ac8c3f27a507d0489d18b51d6deba6364a99ce authored by Johannes Schindelin on 04 December 2019, 20:26:31 UTC
Sync with 2.14.6
Tip revision: d3ac8c3
git-parse-remote.sh
# This is a shell library to calculate the remote repository and
# upstream branch that should be pulled by "git pull" from the current
# branch.

# git-ls-remote could be called from outside a git managed repository;
# this would fail in that case and would issue an error message.
GIT_DIR=$(git rev-parse -q --git-dir) || :;

get_default_remote () {
	curr_branch=$(git symbolic-ref -q HEAD)
	curr_branch="${curr_branch#refs/heads/}"
	origin=$(git config --get "branch.$curr_branch.remote")
	echo ${origin:-origin}
}

get_remote_merge_branch () {
	case "$#" in
	0|1)
	    origin="$1"
	    default=$(get_default_remote)
	    test -z "$origin" && origin=$default
	    curr_branch=$(git symbolic-ref -q HEAD) &&
	    [ "$origin" = "$default" ] &&
	    echo $(git for-each-ref --format='%(upstream)' $curr_branch)
	    ;;
	*)
	    repo=$1
	    shift
	    ref=$1
	    # FIXME: It should return the tracking branch
	    #        Currently only works with the default mapping
	    case "$ref" in
	    +*)
		ref=$(expr "z$ref" : 'z+\(.*\)')
		;;
	    esac
	    expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
	    remote=$(expr "z$ref" : 'z\([^:]*\):')
	    case "$remote" in
	    '' | HEAD ) remote=HEAD ;;
	    heads/*) remote=${remote#heads/} ;;
	    refs/heads/*) remote=${remote#refs/heads/} ;;
	    refs/* | tags/* | remotes/* ) remote=
	    esac
	    [ -n "$remote" ] && case "$repo" in
		.)
		    echo "refs/heads/$remote"
		    ;;
		*)
		    echo "refs/remotes/$repo/$remote"
		    ;;
	    esac
	esac
}

error_on_missing_default_upstream () {
	cmd="$1"
	op_type="$2"
	op_prep="$3" # FIXME: op_prep is no longer used
	example="$4"
	branch_name=$(git symbolic-ref -q HEAD)
	display_branch_name="${branch_name#refs/heads/}"
	# If there's only one remote, use that in the suggestion
	remote="$(gettext "<remote>")"
	branch="$(gettext "<branch>")"
	if test $(git remote | wc -l) = 1
	then
		remote=$(git remote)
	fi

	if test -z "$branch_name"
	then
		gettextln "You are not currently on a branch."
	else
		gettextln "There is no tracking information for the current branch."
	fi
	case "$op_type" in
	rebase)
		gettextln "Please specify which branch you want to rebase against."
		;;
	merge)
		gettextln "Please specify which branch you want to merge with."
		;;
	*)
		echo >&2 "BUG: unknown operation type: $op_type"
		exit 1
		;;
	esac
	eval_gettextln "See git-\${cmd}(1) for details."
	echo
	echo "    $example"
	echo
	if test -n "$branch_name"
	then
		gettextln "If you wish to set tracking information for this branch you can do so with:"
		echo
		echo "    git branch --set-upstream-to=$remote/$branch $display_branch_name"
		echo
	fi
	exit 1
}
back to top