From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Jan 2010 08:48:47 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.5.8~5^2^2^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96aa7adda3b0254e4b9904f53bb38cd76bfea7bb;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  base85: Make the code more obvious instead of explaining the non-obvious
  base85: encode_85() does not use the decode table
  base85 debug code: Fix length byte calculation
  checkout -m: do not try to fall back to --merge from an unborn branch
  branch: die explicitly why when calling "git branch [-a|-r] branchname".
---

96aa7adda3b0254e4b9904f53bb38cd76bfea7bb
diff --cc builtin-checkout.c
index b5dd9c07b,b76cd2277..f32b14838
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -423,10 -292,15 +423,16 @@@ static int merge_working_tree(struct ch
  			 */
  			struct tree *result;
  			struct tree *work;
 +			struct merge_options o;
  			if (!opts->merge)
  				return 1;
- 			parse_commit(old->commit);
+ 
+ 			/*
+ 			 * Without old->commit, the below is the same as
+ 			 * the two-tree unpack we already tried and failed.
+ 			 */
+ 			if (!old->commit)
+ 				return 1;
  
  			/* Do more real merge */