From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Mar 2010 20:44:09 +0000 (-0800)
Subject: Merge branch 'ml/fill-mm-refactor'
X-Git-Tag: v1.7.1-rc0~114
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d5f61ce1574d0167fd0902bd3c6ed83bd072e976?ds=inline;hp=-c

Merge branch 'ml/fill-mm-refactor'

* ml/fill-mm-refactor:
refactor duplicated fill_mm() in checkout and merge-recursive
---

d5f61ce1574d0167fd0902bd3c6ed83bd072e976
diff --combined builtin-checkout.c
index c5ab7835e1,22ae92f608..acefaaf41a
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -128,24 -128,6 +128,6 @@@ static int checkout_stage(int stage, st
  		     (stage == 2) ? "our" : "their");
  }
  
- /* NEEDSWORK: share with merge-recursive */
- static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
- {
- 	unsigned long size;
- 	enum object_type type;
- 
- 	if (!hashcmp(sha1, null_sha1)) {
- 		mm->ptr = xstrdup("");
- 		mm->size = 0;
- 		return;
- 	}
- 
- 	mm->ptr = read_sha1_file(sha1, &type, &size);
- 	if (!mm->ptr || type != OBJ_BLOB)
- 		die("unable to read blob object %s", sha1_to_hex(sha1));
- 	mm->size = size;
- }
- 
  static int checkout_merged(int pos, struct checkout *state)
  {
  	struct cache_entry *ce = active_cache[pos];
@@@ -163,9 -145,9 +145,9 @@@
  	    ce_stage(active_cache[pos+2]) != 3)
  		return error("path '%s' does not have all 3 versions", path);
  
- 	fill_mm(active_cache[pos]->sha1, &ancestor);
- 	fill_mm(active_cache[pos+1]->sha1, &ours);
- 	fill_mm(active_cache[pos+2]->sha1, &theirs);
+ 	read_mmblob(&ancestor, active_cache[pos]->sha1);
+ 	read_mmblob(&ours, active_cache[pos+1]->sha1);
+ 	read_mmblob(&theirs, active_cache[pos+2]->sha1);
  
  	status = ll_merge(&result_buf, path, &ancestor,
  			  &ours, "ours", &theirs, "theirs", 0);
@@@ -488,20 -470,6 +470,20 @@@ static void report_tracking(struct bran
  	strbuf_release(&sb);
  }
  
 +static void detach_advice(const char *old_path, const char *new_name)
 +{
 +	const char fmt[] =
 +	"Note: checking out '%s'.\n\n"
 +	"You are in 'detached HEAD' state. You can look around, make experimental\n"
 +	"changes and commit them, and you can discard any commits you make in this\n"
 +	"state without impacting any branches by performing another checkout.\n\n"
 +	"If you want to create a new branch to retain commits you create, you may\n"
 +	"do so (now or later) by using -b with the checkout command again. Example:\n\n"
 +	"  git checkout -b new_branch_name\n\n";
 +
 +	fprintf(stderr, fmt, new_name);
 +}
 +
  static void update_refs_for_switch(struct checkout_opts *opts,
  				   struct branch_info *old,
  				   struct branch_info *new)
@@@ -536,8 -504,8 +518,8 @@@
  		update_ref(msg.buf, "HEAD", new->commit->object.sha1, NULL,
  			   REF_NODEREF, DIE_ON_ERR);
  		if (!opts->quiet) {
 -			if (old->path)
 -				fprintf(stderr, "Note: moving to '%s' which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n  git checkout -b <new_branch_name>\n", new->name);
 +			if (old->path && advice_detached_head)
 +				detach_advice(old->path, new->name);
  			describe_detached_head("HEAD is now at", new->commit);
  		}
  	}