Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit adc7052bb6e737cec0c6702f8dde259540eab672 2 parents 9de9681 + cb8ad28
Junio C Hamano authored
1  t/t3404-rebase-interactive.sh
@@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '
247 247
 '
248 248
 
249 249
 test_expect_failure 'exchange two commits with -p' '
  250
+	git checkout H &&
250 251
 	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
251 252
 	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
252 253
 	test G = $(git cat-file commit HEAD | sed -ne \$p)
4  t/t7408-submodule-reference.sh
@@ -28,7 +28,7 @@ git prune'
28 28
 
29 29
 cd "$base_dir"
30 30
 
31  
-test_expect_success 'preparing supermodule' \
  31
+test_expect_success 'preparing superproject' \
32 32
 'test_create_repo super && cd super &&
33 33
 echo file > file &&
34 34
 git add file &&
@@ -55,7 +55,7 @@ diff expected current'
55 55
 
56 56
 cd "$base_dir"
57 57
 
58  
-test_expect_success 'cloning supermodule' \
  58
+test_expect_success 'cloning superproject' \
59 59
 'git clone super super-clone'
60 60
 
61 61
 cd "$base_dir"
2  t/t9300-fast-import.sh
@@ -1657,7 +1657,7 @@ M 160000 :6 sub
1657 1657
 INPUT_END
1658 1658
 
1659 1659
 test_expect_success \
1660  
-	'P: supermodule & submodule mix' \
  1660
+	'P: superproject & submodule mix' \
1661 1661
 	'git fast-import <input &&
1662 1662
 	 git checkout subuse1 &&
1663 1663
 	 rm -rf sub && mkdir sub && (cd sub &&
2  unpack-trees.c
@@ -1210,7 +1210,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
1210 1210
 			return 0;
1211 1211
 		/*
1212 1212
 		 * NEEDSWORK: the current default policy is to allow
1213  
-		 * submodule to be out of sync wrt the supermodule
  1213
+		 * submodule to be out of sync wrt the superproject
1214 1214
 		 * index.  This needs to be tightened later for
1215 1215
 		 * submodules that are marked to be automatically
1216 1216
 		 * checked out.

0 notes on commit adc7052

Please sign in to comment.
Something went wrong with that request. Please try again.