12 files changed, 17 insertions, 4 deletions
diff --git a/tests/common/git/init b/tests/common/git/init
index 691799e..e80ebf4 100755
--- a/tests/common/git/init
+++ b/tests/common/git/init
@@ -37,8 +37,8 @@ if [ -n "$unpack" ]; then
   done
 fi
 
-# Create the initial state of the repositories libfoo.git, libbar.git,
-# style.git, and style-basic.git.
+# Create the initial state of the repositories libfoo.git, libfox.git,
+# libbar.git, style.git, and style-basic.git.
 #
 cd state0
 
@@ -48,6 +48,10 @@ rm -f    libfoo.git/README
 rm -f -r libfoo.git/libbar
 rm -f -r libfoo.git/doc/style
 
+rm -f -r libfox.git/.git
+rm -f    libfox.git/.gitmodules
+rm -f -r libfox.git/libbar
+
 rm -f -r libbar.git/.git
 
 rm -f -r style.git/.git
@@ -113,6 +117,14 @@ touch  libfoo.git/README
 git -C libfoo.git add README
 git -C libfoo.git commit -am 'README'
 
+# Create master branch for libfox.git, adding libbar.git as a submodule.
+#
+git -C libfox.git init
+git -C libfox.git add '*'
+git -C libfox.git submodule add ../libbar.git libbar
+git -C libfox.git submodule update --init --recursive # Recursive for safety.
+git -C libfox.git commit -am 'Create'
+
 # Create the modified state of the repositories, replacing libbar.git submodule
 # of libfoo with the newly created libbaz.git repository. Also advance master
 # branches and tags for libfoo.git and it's submodule style.git.
diff --git a/tests/common/git/pack b/tests/common/git/pack
index f53e794..f9d9772 100755
--- a/tests/common/git/pack
+++ b/tests/common/git/pack
@@ -13,8 +13,9 @@ set -o errtrace # Trap in functions.
 function info () { echo "$*" 1>&2; }
 function error () { info "$*"; exit 1; }
 
-projects=('state0/libfoo' 'state0/libbar' 'state0/style' 'state0/style-basic' \
-	  'state1/libfoo' 'state1/libbaz' 'state1/style' 'state1/style-basic')
+projects=(\
+  state0/libfoo state0/libfox state0/libbar state0/style state0/style-basic \
+  state1/libfoo state1/libfox state1/libbaz state1/style state1/style-basic)
 
 for p in "${projects[@]}"; do
   d=$p.git
diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar
index bbb6f81..8be7c94 100644
--- a/tests/common/git/state0/libbar.tar
+++ b/tests/common/git/state0/libbar.tar
diff --git a/tests/common/git/state0/libfoo.tar b/tests/common/git/state0/libfoo.tar
index 6f9af32..31b5519 100644
--- a/tests/common/git/state0/libfoo.tar
+++ b/tests/common/git/state0/libfoo.tar
diff --git a/tests/common/git/state0/libfox.tar b/tests/common/git/state0/libfox.tar
new file mode 100644
index 0000000..b4037c5
--- /dev/null
+++ b/tests/common/git/state0/libfox.tar
diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar
index 6a7a1f2..80731dd 100644
--- a/tests/common/git/state0/style-basic.tar
+++ b/tests/common/git/state0/style-basic.tar
diff --git a/tests/common/git/state0/style.tar b/tests/common/git/state0/style.tar
index 6295f34..1a88771 100644
--- a/tests/common/git/state0/style.tar
+++ b/tests/common/git/state0/style.tar
diff --git a/tests/common/git/state1/libbaz.tar b/tests/common/git/state1/libbaz.tar
index ee8ad3e..298712c 100644
--- a/tests/common/git/state1/libbaz.tar
+++ b/tests/common/git/state1/libbaz.tar
diff --git a/tests/common/git/state1/libfoo.tar b/tests/common/git/state1/libfoo.tar
index 4221cdd..2f2e3b4 100644
--- a/tests/common/git/state1/libfoo.tar
+++ b/tests/common/git/state1/libfoo.tar
diff --git a/tests/common/git/state1/libfox.tar b/tests/common/git/state1/libfox.tar
new file mode 100644
index 0000000..d296973
--- /dev/null
+++ b/tests/common/git/state1/libfox.tar
diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar
index 8bc8b85..7391b66 100644
--- a/tests/common/git/state1/style-basic.tar
+++ b/tests/common/git/state1/style-basic.tar
diff --git a/tests/common/git/state1/style.tar b/tests/common/git/state1/style.tar
index feedcaa..4be977b 100644
--- a/tests/common/git/state1/style.tar
+++ b/tests/common/git/state1/style.tar