From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 May 2012 22:45:35 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.11-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/adc7052bb6e737cec0c6702f8dde259540eab672?ds=inline;hp=-c

Merge branch 'maint'

By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
---

adc7052bb6e737cec0c6702f8dde259540eab672
diff --combined t/t3404-rebase-interactive.sh
index 4983bd7775,eab8501e11..025c1c610e
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -247,6 -247,7 +247,7 @@@ test_expect_success '-p handles "no cha
  '
  
  test_expect_failure 'exchange two commits with -p' '
+ 	git checkout H &&
  	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
  	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
  	test G = $(git cat-file commit HEAD | sed -ne \$p)
@@@ -323,7 -324,7 +324,7 @@@ test_expect_success 'verbose flag is he
  	echo resolved > file1 &&
  	git add file1 &&
  	git rebase --continue > output &&
 -	grep "^ file1 |    2 +-$" output
 +	grep "^ file1 | 2 +-$" output
  '
  
  test_expect_success 'multi-squash only fires up editor once' '
diff --combined unpack-trees.c
index bcee99c52e,f0ac24b9f5..ad40109432
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -1027,7 -1027,6 +1027,7 @@@ int unpack_trees(unsigned len, struct t
  	o->result.initialized = 1;
  	o->result.timestamp.sec = o->src_index->timestamp.sec;
  	o->result.timestamp.nsec = o->src_index->timestamp.nsec;
 +	o->result.version = o->src_index->version;
  	o->merge_size = len;
  	mark_all_ce_unused(o->src_index);
  
@@@ -1210,7 -1209,7 +1210,7 @@@ static int verify_uptodate_1(struct cac
  			return 0;
  		/*
  		 * NEEDSWORK: the current default policy is to allow
- 		 * submodule to be out of sync wrt the supermodule
+ 		 * submodule to be out of sync wrt the superproject
  		 * index.  This needs to be tightened later for
  		 * submodules that are marked to be automatically
  		 * checked out.
@@@ -1793,7 -1792,7 +1793,7 @@@ int bind_merge(struct cache_entry **src
  	struct cache_entry *a = src[1];
  
  	if (o->merge_size != 1)
 -		return error("Cannot do a bind merge of %d trees\n",
 +		return error("Cannot do a bind merge of %d trees",
  			     o->merge_size);
  	if (a && old)
  		return o->gently ? -1 :