git.ipfire.org Git - thirdparty/git.git/commitdiff

author	Junio C Hamano <gitster@pobox.com>
	Mon, 27 Jan 2014 18:44:20 +0000 (10:44 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 27 Jan 2014 18:44:21 +0000 (10:44 -0800)

Fix a handful of bugs around interpreting $branch@{upstream}
notation and its lookalike, when $branch part has interesting
characters, e.g. "@", and ":".

* jk/interpret-branch-name-fix:
  interpret_branch_name: find all possible @-marks
  interpret_branch_name: avoid @{upstream} past colon
  interpret_branch_name: always respect "namelen" parameter
  interpret_branch_name: rename "cp" variable to "at"
  interpret_branch_name: factor out upstream handling

		1	2
sha1_name.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge