Merge tag 'v2.12.0.windows.1' into users/johasc/gvfs/merge-2.12.0

Git for Windows v2.12.0

Changes since Git for Windows v2.11.1 (February 3rd 2017)

New Features

  • Comes with Git v2.12.0.
  • The builtin difftool is no longer opt-in, as it graduated to be
    officially adopted by the Git project.
  • Comes with v2.7.0 of the POSIX emulation layer based on the Cygwin
    runtime.
  • Includes cURL 7.53.1.
  • The Portable Git now defaults to using the included Git Credential
    Manager.

Bug Fixes

  • The stderr output is unbuffered again, i.e. errors are displayed
    immediately (this was reported on the Git mailing list as well as
    issues #1064, #1064, #1068).
  • Git can clone again from paths containing non-ASCII characters.
  • We no longer ship two different versions of curl.exe.
  • Hitting Ctrl+T in Git GUI even after all files have been (un)staged
    no longer throws an exception.
  • A couple of Git GUI bugs regarding the list of recent repositories
    have been fixed.
  • The git-bash.exe helper now waits again for the terminal to be
    closed before returning.
  • Git for Windows no longer attempts to send empty credentials to
    HTTP(S) servers that handle only Basic and/or Digest authentication
    .

.github/ISSUE_TEMPLATE.md

@@ -6,14 +6,16 @@
 
 ```
 $ git --version --build-options
-_TODO_
+
+** insert your machine's response here **
 ```
 
  - Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?
 
 ```
 $ cmd.exe /c ver
-_TODO_
+
+** insert your machine's response here **
 ```
 
  - What options did you set as part of the installation? Or did you choose the
@@ -25,36 +27,37 @@ _TODO_
 > type "C:\Program Files (x86)\Git\etc\install-options.txt"
 > type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
 $ cat /etc/install-options.txt
-_TODO_
+
+** insert your machine's response here **
 ```
 
  - Any other interesting things about your environment that might be related
    to the issue you're seeing?
 
- _TODO_
+** insert your response here **
 
 ### Details
 
  - Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
 
- _TODO_
+** insert your response here **
 
  - What commands did you run to trigger this issue? If you can provide a
    [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve)
    this will help us understand the issue.
 
 ```
-TODO
+** insert your commands here **
 ```
  - What did you expect to occur after running these commands?
 
- _TODO_
+** insert here **
 
  - What actually happened instead?
 
- _TODO_
+** insert here **
 
  - If the problem was occurring with a specific repository, can you provide the
    URL to that repository to help us with testing?
 
- _TODO_
+** insert URL here **

.gitignore

@@ -76,7 +76,6 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
-/git-legacy-difftool
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -120,7 +119,6 @@
 /git-rebase--merge
 /git-receive-pack
 /git-reflog
-/git-relink
 /git-remote
 /git-remote-http
 /git-remote-https

.mailmap

@@ -192,6 +192,8 @@ Philippe Bruhat <[email protected]>
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Jones <[email protected]> <[email protected]>
 René Scharfe <[email protected]> <[email protected]>
+Richard Hansen <[email protected]> <[email protected]>
+Richard Hansen <[email protected]> <[email protected]>
 Robert Fitzsimons <[email protected]>
 Robert Shearman <[email protected]> <[email protected]>
 Robert Zeh <[email protected]>
@@ -223,6 +225,7 @@ Steven Walter <[email protected]> <[email protected]>
 Steven Walter <[email protected]> <[email protected]>
 Sven Verdoolaege <[email protected]> <[email protected]>
 Sven Verdoolaege <[email protected]> <[email protected]>
+SZEDER Gábor <[email protected]> <[email protected]>
 Tay Ray Chuan <[email protected]>
 Ted Percival <[email protected]> <[email protected]>
 Theodore Ts'o <[email protected]>

.travis.yml

@@ -75,20 +75,12 @@ before_install:
       popd
       ;;
     osx)
-      brew_force_set_latest_binary_hash () {
-        FORMULA=$1
-        SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
-        sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
-          "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
-      }
       brew update --quiet
-      brew tap homebrew/binary --quiet
-      brew_force_set_latest_binary_hash perforce
-      brew_force_set_latest_binary_hash perforce-server
       # Uncomment this if you want to run perf tests:
       # brew install gnu-time
-      brew install git-lfs perforce-server perforce gettext
+      brew install git-lfs gettext
       brew link --force gettext
+      brew install caskroom/cask/perforce
       ;;
     esac;
     echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)";

Documentation/CodingGuidelines

@@ -206,11 +206,38 @@ For C programs:
 		x = 1;
 	}
 
-   is frowned upon.  A gray area is when the statement extends
-   over a few lines, and/or you have a lengthy comment atop of
-   it.  Also, like in the Linux kernel, if there is a long list
-   of "else if" statements, it can make sense to add braces to
-   single line blocks.
+   is frowned upon. But there are a few exceptions:
+
+	- When the statement extends over a few lines (e.g., a while loop
+	  with an embedded conditional, or a comment). E.g.:
+
+		while (foo) {
+			if (x)
+				one();
+			else
+				two();
+		}
+
+		if (foo) {
+			/*
+			 * This one requires some explanation,
+			 * so we're better off with braces to make
+			 * it obvious that the indentation is correct.
+			 */
+			doit();
+		}
+
+	- When there are multiple arms to a conditional and some of them
+	  require braces, enclose even a single line block in braces for
+	  consistency. E.g.:
+
+		if (foo) {
+			doit();
+		} else {
+			one();
+			two();
+			three();
+		}
 
  - We try to avoid assignments in the condition of an "if" statement.
 

Documentation/Makefile

@@ -120,6 +120,7 @@ INSTALL_INFO = install-info
 DOCBOOK2X_TEXI = docbook2x-texi
 DBLATEX = dblatex
 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
+DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
 ifndef PERL_PATH
 	PERL_PATH = /usr/bin/perl
 endif
@@ -173,6 +174,16 @@ ifdef GNU_ROFF
 XMLTO_EXTRA += -m manpage-quote-apos.xsl
 endif
 
+ifdef USE_ASCIIDOCTOR
+ASCIIDOC = asciidoctor
+ASCIIDOC_CONF =
+ASCIIDOC_HTML = xhtml5
+ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
+ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
+DBLATEX_COMMON =
+endif
+
 SHELL_PATH ?= $(SHELL)
 # Shell quote;
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -368,13 +379,14 @@ user-manual.texi: user-manual.xml
 
 user-manual.pdf: user-manual.xml
 	$(QUIET_DBLATEX)$(RM) $@.new $@ && \
-	$(DBLATEX) -o $@.new -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty $< && \
+	$(DBLATEX) -o $@.new $(DBLATEX_COMMON) $< && \
 	mv $@.new $@
 
-gitman.texi: $(MAN_XML) cat-texi.perl
+gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
 	$(QUIET_DB2TEXI)$(RM) $@.new $@ && \
-	($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
-		--to-stdout $(xml) &&) true) > $@.new.new && \
+	($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml).new texi.xsl $(xml) && \
+		$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml).new && \
+		rm $(xml).new &&) true) > $@.new.new && \
 	$(PERL_PATH) cat-texi.perl $@ <$@.new.new >$@.new && \
 	rm $@.new.new && \
 	mv $@.new $@

Documentation/RelNotes/2.11.1.txt

@@ -116,5 +116,53 @@ Fixes since v2.11
    will never come.  Teach the client side to notice this condition
    and abort the transfer.
 
+ * Some platforms no longer understand "latin-1" that is still seen in
+   the wild in e-mail headers; replace them with "iso-8859-1" that is
+   more widely known when conversion fails from/to it.
+
+ * Update the procedure to generate "tags" for developer support.
+
+ * Update the definition of the MacOSX test environment used by
+   TravisCI.
+
+ * A few git-svn updates.
+
+ * Compression setting for producing packfiles were spread across
+   three codepaths, one of which did not honor any configuration.
+   Unify these so that all of them honor core.compression and
+   pack.compression variables the same way.
+
+ * "git fast-import" sometimes mishandled while rebalancing notes
+   tree, which has been fixed.
+
+ * Recent update to the default abbreviation length that auto-scales
+   lacked documentation update, which has been corrected.
+
+ * Leakage of lockfiles in the config subsystem has been fixed.
+
+ * It is natural that "git gc --auto" may not attempt to pack
+   everything into a single pack, and there is no point in warning
+   when the user has configured the system to use the pack bitmap,
+   leading to disabling further "gc".
+
+ * "git archive" did not read the standard configuration files, and
+   failed to notice a file that is marked as binary via the userdiff
+   driver configuration.
+
+ * "git blame --porcelain" misidentified the "previous" <commit, path>
+   pair (aka "source") when contents came from two or more files.
+
+ * "git rebase -i" with a recent update started showing an incorrect
+   count when squashing more than 10 commits.
+
+ * "git <cmd> @{push}" on a detached HEAD used to segfault; it has
+   been corrected to error out with a message.
+
+ * Tighten a test to avoid mistaking an extended ERE regexp engine as
+   a PRE regexp engine.
+
+ * Typing ^C to pager, which usually does not kill it, killed Git and
+   took the pager down as a collateral damage in certain process-tree
+   structure.  This has been fixed.
 
 Also contains various documentation updates and code clean-ups.