From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 May 2008 20:38:27 +0000 (-0700)
Subject: Merge branch 'jc/unpack-trees-reword'
X-Git-Tag: v1.5.6-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a24d287fb305949d9eb534bf3216c0c6a7b4392f?ds=inline;hp=-c

Merge branch 'jc/unpack-trees-reword'

* jc/unpack-trees-reword:
unpack-trees: allow Porcelain to give different error messages
---

a24d287fb305949d9eb534bf3216c0c6a7b4392f
diff --combined builtin-checkout.c
index 05c06421b6,83da7ca9ff..68fffd28cb
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -236,6 -236,8 +236,8 @@@ static int merge_working_tree(struct ch
  		topts.src_index = &the_index;
  		topts.dst_index = &the_index;
  
+ 		topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches.";
+ 
  		refresh_cache(REFRESH_QUIET);
  
  		if (unmerged_cache()) {
@@@ -282,7 -284,7 +284,7 @@@
  			 * entries in the index.
  			 */
  
 -			add_files_to_cache(0, NULL, NULL);
 +			add_files_to_cache(NULL, NULL, 0);
  			work = write_tree_from_memory();
  
  			ret = reset_to_new(new->commit->tree, opts->quiet);