From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Dec 2013 19:34:01 +0000 (-0800)
Subject: Merge branch 'mi/typofixes' into maint
X-Git-Tag: v1.8.5.2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a4a227a7259df19e22e45fc55b143107afadc00b?ds=inline;hp=-c

Merge branch 'mi/typofixes' into maint

* mi/typofixes:
contrib: typofixes
Documentation/technical/http-protocol.txt: typofixes
typofixes: fix misspelt comments
---

a4a227a7259df19e22e45fc55b143107afadc00b
diff --combined pathspec.c
index 4cf2bd365a,be962d47aa..87b3b82f1f
--- a/pathspec.c
+++ b/pathspec.c
@@@ -128,11 -128,7 +128,11 @@@ static unsigned prefix_pathspec(struct 
  		die(_("global 'literal' pathspec setting is incompatible "
  		      "with all other global pathspec settings"));
  
 -	if (elt[0] != ':' || literal_global) {
 +	if (flags & PATHSPEC_LITERAL_PATH)
 +		global_magic = 0;
 +
 +	if (elt[0] != ':' || literal_global ||
 +	    (flags & PATHSPEC_LITERAL_PATH)) {
  		; /* nothing to do */
  	} else if (elt[1] == '(') {
  		/* longhand */
@@@ -197,11 -193,11 +197,11 @@@
  	magic |= short_magic;
  	*p_short_magic = short_magic;
  
- 	/* --noglob-pathspec adds :(literal) _unless_ :(glob) is specifed */
+ 	/* --noglob-pathspec adds :(literal) _unless_ :(glob) is specified */
  	if (noglob_global && !(magic & PATHSPEC_GLOB))
  		global_magic |= PATHSPEC_LITERAL;
  
- 	/* --glob-pathspec is overriden by :(literal) */
+ 	/* --glob-pathspec is overridden by :(literal) */
  	if ((global_magic & PATHSPEC_GLOB) && (magic & PATHSPEC_LITERAL))
  		global_magic &= ~PATHSPEC_GLOB;
  
@@@ -409,9 -405,6 +409,9 @@@ void parse_pathspec(struct pathspec *pa
  		item[i].magic = prefix_pathspec(item + i, &short_magic,
  						argv + i, flags,
  						prefix, prefixlen, entry);
 +		if ((flags & PATHSPEC_LITERAL_PATH) &&
 +		    !(magic_mask & PATHSPEC_LITERAL))
 +			item[i].magic |= PATHSPEC_LITERAL;
  		if (item[i].magic & magic_mask)
  			unsupported_magic(entry,
  					  item[i].magic & magic_mask,