From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:43 +0000 (-0700)
Subject: Merge branch 'fc/merge-default-to-upstream'
X-Git-Tag: v2.1.0-rc0~194
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8ef69fe2e837d78250555807073b5405f7c9297?ds=inline;hp=-c

Merge branch 'fc/merge-default-to-upstream'

"git merge" without argument, even when there is an upstream
defined for the current branch, refused to run until
merge.defaultToUpstream is set to true. Flip the default of that
configuration variable to true.

* fc/merge-default-to-upstream:
merge: enable defaulttoupstream by default
---

b8ef69fe2e837d78250555807073b5405f7c9297
diff --combined builtin/merge.c
index 7c9d8f2432,1fc9319d8f..428ca247bd
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -63,7 -63,7 +63,7 @@@ static int verbosity
  static int allow_rerere_auto;
  static int abort_current_merge;
  static int show_progress = -1;
- static int default_to_upstream;
+ static int default_to_upstream = 1;
  static const char *sign_commit;
  
  static struct strategy all_strategy[] = {
@@@ -398,7 -398,7 +398,7 @@@ static void finish(struct commit *head_
  			const char *argv_gc_auto[] = { "gc", "--auto", NULL };
  			update_ref(reflog_message.buf, "HEAD",
  				new_head, head, 0,
 -				DIE_ON_ERR);
 +				UPDATE_REFS_DIE_ON_ERR);
  			/*
  			 * We ignore errors in 'gc --auto', since the
  			 * user should see them.
@@@ -1222,7 -1222,7 +1222,7 @@@ int cmd_merge(int argc, const char **ar
  			die(_("%s - not something we can merge"), argv[0]);
  		read_empty(remote_head->object.sha1, 0);
  		update_ref("initial pull", "HEAD", remote_head->object.sha1,
 -			   NULL, 0, DIE_ON_ERR);
 +			   NULL, 0, UPDATE_REFS_DIE_ON_ERR);
  		goto done;
  	} else {
  		struct strbuf merge_names = STRBUF_INIT;
@@@ -1339,7 -1339,7 +1339,7 @@@
  	}
  
  	update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.sha1,
 -		   NULL, 0, DIE_ON_ERR);
 +		   NULL, 0, UPDATE_REFS_DIE_ON_ERR);
  
  	if (remoteheads && !common)
  		; /* No common ancestors found. We need a real merge. */