Merge branch 'pt/pull-tags-error-diag' into maint
There was a dead code that used to handle "git pull --tags" and show special-cased error message, which was made irrelevant when the semantics of the option changed back in Git 1.9 days. * pt/pull-tags-error-diag: pull: remove --tags error in no merge candidates casemaint
						commit
						6356003c80
					
				|  | @ -193,15 +193,6 @@ esac | ||||||
|  |  | ||||||
| error_on_no_merge_candidates () { | error_on_no_merge_candidates () { | ||||||
| 	exec >&2 | 	exec >&2 | ||||||
| 	for opt |  | ||||||
| 	do |  | ||||||
| 		case "$opt" in |  | ||||||
| 		-t|--t|--ta|--tag|--tags) |  | ||||||
| 			echo "It doesn't make sense to pull all tags; you probably meant:" |  | ||||||
| 			echo "  git fetch --tags" |  | ||||||
| 			exit 1 |  | ||||||
| 		esac |  | ||||||
| 	done |  | ||||||
|  |  | ||||||
| 	if test true = "$rebase" | 	if test true = "$rebase" | ||||||
| 	then | 	then | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano