From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Nov 2017 05:05:32 +0000 (+0900)
Subject: Merge branch 'tz/fsf-address-update' into maint
X-Git-Tag: v2.15.1~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b2a276830fa6266469dcc50107bdee02a9daa33b?hp=-c

Merge branch 'tz/fsf-address-update' into maint

Replace the mailing address of FSF to a URL, as FSF prefers.

* tz/fsf-address-update:
Replace Free Software Foundation address in license notices
Replace Free Software Foundation address in license notices
---

b2a276830fa6266469dcc50107bdee02a9daa33b
diff --combined contrib/completion/git-completion.bash
index 539d7f84f3,6934064ee9..a54cc2cef6
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -111,8 -111,7 +111,7 @@@ __git (
  #   GNU General Public License for more details.
  #
  #   You should have received a copy of the GNU General Public License
- #   along with this program; if not, write to the Free Software Foundation,
- #   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #   along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  #   The latest version of this software can be obtained here:
  #
@@@ -1250,8 -1249,7 +1249,8 @@@ _git_checkout (
  	--*)
  		__gitcomp "
  			--quiet --ours --theirs --track --no-track --merge
 -			--conflict= --orphan --patch
 +			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
 +			--recurse-submodules --no-recurse-submodules
  			"
  		;;
  	*)
diff --combined contrib/credential/libsecret/git-credential-libsecret.c
index b4750c9ee8,cfe295f36b..e6598b6383
--- a/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@@ -14,8 -14,7 +14,7 @@@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  
  /*
@@@ -104,7 -103,7 +103,7 @@@ static int keyring_get(struct credentia
  	items = secret_service_search_sync(service,
  					   SECRET_SCHEMA_COMPAT_NETWORK,
  					   attributes,
 -					   SECRET_SEARCH_LOAD_SECRETS,
 +					   SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_UNLOCK,
  					   NULL,
  					   &error);
  	g_hash_table_unref(attributes);