From 3ef6eb2df7d01d3fda6d6b89657c26d8ebedc589 Mon Sep 17 00:00:00 2001
From: kx <kx@radix.pro>
Date: Wed, 14 Nov 2018 08:24:16 +0300
Subject: [PATCH 1/4] Created from upstream/master
 5d6aba91dbff3157e498b0a795e99e2fcb7d9ec4


From 29a1e4669d9a1852a3e582ecbed5fca631657a7e Mon Sep 17 00:00:00 2001
From: kx <kx@radix.pro>
Date: Wed, 14 Nov 2018 08:44:36 +0300
Subject: [PATCH 2/4] Move the .gitrepo config file to .gitrepo/config

---
 Changes                               |  6 ++++
 Intro.pod                             | 10 +++---
 ReadMe.pod                            | 28 ++++++++--------
 doc/git-subrepo.swim                  | 28 ++++++++--------
 doc/intro-to-subrepo.swim             | 10 +++---
 lib/git-subrepo                       | 48 ++++++++++++++-------------
 lib/git-subrepo.d/help-functions.bash | 16 ++++-----
 man/man1/git-subrepo.1                | 28 ++++++++--------
 note/Story1                           |  4 +--
 note/ToDo                             |  4 +--
 note/design.swim                      | 10 +++---
 note/design2.swim                     |  6 ++--
 note/init-test                        |  4 +--
 share/zsh-completion/_git-subrepo     |  2 +-
 test/branch.t                         |  2 +-
 test/clone.t                          |  4 +--
 test/config.t                         |  4 +--
 test/error.t                          |  2 +-
 test/gitignore.t                      |  4 +--
 test/init.t                           |  4 +--
 test/pull-merge.t                     |  6 ++--
 test/pull-new-branch.t                |  2 +-
 test/pull.t                           |  4 +--
 test/push-after-init.t                |  6 ++--
 test/push-squash.t                    |  2 +-
 test/push.t                           |  6 ++--
 test/setup                            |  8 ++---
 27 files changed, 133 insertions(+), 125 deletions(-)

diff --git a/Changes b/Changes
index aee5e7c1..832906d1 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@
 version: 0.4.0
 date:    Thu Nov  8 12:26:38 CET 2018
 changes:
+- Moved .gitrepo to .gitrepo/config
 - Fix #325 Do not squash main repo commits
 - Improve error message for worktree handling
 - Make version checking portable. #307
@@ -35,6 +36,11 @@ changes:
 - Fix env var bug in test/push.t
 - Do not overwrite author information
 ---
+version: 0.4.0
+date:    Tue Oct  25 23:08:56 PST 2018
+changes:
+- Move .gitrepo to .gitrepo/config
+---
 version: 0.3.1
 date:    Tue Jan  3 23:08:56 PST 2017
 changes:
diff --git a/Intro.pod b/Intro.pod
index b7316fec..9a761f48 100644
--- a/Intro.pod
+++ b/Intro.pod
@@ -260,7 +260,7 @@ Consider the equivalent subrepo commands:
     $ git subrepo pull foo
     $ git subrepo push foo
 
-Collaborators see a file called 'foo/.gitrepo', and know that the subdir is a
+Collaborators see a file called 'foo/.gitrepo/config', and know that the subdir is a
 subrepo. The file contains all the information needed by future commands
 applied to that subrepo.
 
@@ -348,7 +348,7 @@ Given this we do the following steps internally:
 
 =item * Create a new subrepo commit object for the subdir content
 
-=item * Add a state file called .gitrepo to the new subrepo/subdir
+=item * Add a state file called .gitrepo/config to the new subrepo/subdir
 
 =item * Amend the merge commit with this new file
 
@@ -365,7 +365,7 @@ as possible. You don't need to have the subrepo history in your main
 project, since it is immutably available elsewhere, and you have a pointer
 to that place.
 
-The new foo/.gitrepo file looks like this:
+The new foo/.gitrepo/config file looks like this:
 
     [subrepo]
             remote = git@github.com:you/foo.git
@@ -382,7 +382,7 @@ collaborators need this url to pull/push in the future.
 
 The next command is the pull command. Normally you just give it the subrepo's
 subdir path (although you can change the branch with -b), and it will get the
-other info from the subdir/.gitrepo file.
+other info from the subdir/.gitrepo/config file.
 
 The pull command does these steps:
 
@@ -398,7 +398,7 @@ The pull command does these steps:
 
 =item * Commit the HEAD of the rebased content
 
-=item * Update/amend the .gitrepo file
+=item * Update/amend the .gitrepo/config file
 
 =back
 
diff --git a/ReadMe.pod b/ReadMe.pod
index de035fa3..2fee848d 100644
--- a/ReadMe.pod
+++ b/ReadMe.pod
@@ -70,9 +70,9 @@ The C<git-subrepo> command benefits these roles in the following ways:
 
 =item * Collaborators do not need to install unless they want to push/pull.
 
-=item * Collaborators know when a subdir is a subrepo (it has a C<.gitrepo> file).
+=item * Collaborators know when a subdir is a subrepo (it has a C<.gitrepo/config> file).
 
-=item * The C<.gitrepo> file never gets pushed back to the subrepo upstream.
+=item * The C<.gitrepo/config> file never gets pushed back to the subrepo upstream.
 
 =item * Well named branches and remotes are generated for manual operations.
 
@@ -141,7 +141,7 @@ and merged into the subdir.
 
 The subrepo history is I<squashed> into a single commit that contains the
 reference information. This information is also stored in a special file
-called C<< <subdir>/.gitrepo >>. The presence of this file indicates that the
+called C<< <subdir>/.gitrepo/config >>. The presence of this file indicates that the
 directory is a subrepo.
 
 All subsequent commands refer to the subrepo by the name of the
@@ -164,14 +164,14 @@ If you want to expose a subdirectory of your project as a published subrepo,
 this command will do that. It will split out the content of a normal
 subdirectory into a branch and start tracking it as a subrepo. Afterwards your
 original repo will look exactly the same except that there will be a C<<
-<subdir>/.gitrepo >> file.
+<subdir>/.gitrepo/config >> file.
 
 If you specify the C<--remote> (and optionally the C<--branch>) option, the
-values will be added to the C<< <subdir>/.gitrepo >> file. The C<--remote>
+values will be added to the C<< <subdir>/.gitrepo/config >> file. The C<--remote>
 option is the upstream URL, and the C<--branch> option is the upstream branch
 to push to. These values will be needed to do a C<git subrepo push> command,
 but they can be provided later on the C<push> command (and saved to C<<
-<subdir>/.gitrepo >> if you also specify the C<--update> option).
+<subdir>/.gitrepo/config >> if you also specify the C<--update> option).
 
 Note: You will need to create the empty upstream repo and push to it on your
       own, using C<< git subrepo push <subdir> >>.
@@ -186,11 +186,11 @@ The C<init> command accepts the C<--branch=> and C<--remote=> options.
 Update the subrepo subdir with the latest upstream changes.
 
 The C<pull> command fetches the latest content from the remote branch pointed
-to by the subrepo's C<.gitrepo> file, and then tries to merge the changes into
+to by the subrepo's C<.gitrepo/config> file, and then tries to merge the changes into
 the corresponding subdir. It does this by making a branch of the local commits
 to the subdir and then merging or rebasing (see below) it with the fetched
 upstream content. After the merge, the content of the new branch replaces your
-subdir, the C<.gitrepo> file is updated and a single 'pull' commit is added to
+subdir, the C<.gitrepo/config> file is updated and a single 'pull' commit is added to
 your mainline history.
 
 The C<pull> command will attempt to do the following commands in one go:
@@ -339,9 +339,9 @@ The C<clean> command accepts the C<--all>, C<--ALL>, and C<--force> options.
 
 =item C<< git subrepo config <subdir> <option> [<value>] [-f] >>
 
-Read or update configuration values in the subdir/.gitrepo file.
+Read or update configuration values in the subdir/.gitrepo/config file.
 
-Because most of the values stored in the .gitrepo file are generated you
+Because most of the values stored in the .gitrepo/config file are generated you
 will need to use C<--force> if you want to change anything else then the
 C<method> option.
 
@@ -408,7 +408,7 @@ commands that C<--all> works for.
 =item C<< --branch=<branch-name> >> (C<< -b <branch-name> >>)
 
 Use a different upstream branch-name than the remote HEAD or the one saved in
-C<.gitrepo> locally.
+C<.gitrepo/config> locally.
 
 =item C<--dry-run> (C<-N>)
 
@@ -446,7 +446,7 @@ setup for push).
 
 =item C<< --remote=<remote-url> >> (C<< -r <remote-url> >>)
 
-Use a different remote-url than the one saved in C<.gitrepo> locally.
+Use a different remote-url than the one saved in C<.gitrepo/config> locally.
 
 =item C<--squash> (C<-s>)
 
@@ -455,7 +455,7 @@ Squash all commits on a push into one new commit.
 =item C<--update> (C<-u>)
 
 If C<--branch> or C<--remote> are used, and the command updates the
-C<.gitrepo> file, include these values to the update.
+C<.gitrepo/config> file, include these values to the update.
 
 =back
 
@@ -679,7 +679,7 @@ C<irc.freenode.net>.
 
 =item * Written in (very modern) Bash, with full test suite. Take a look.
 
-=item * A C<.gitrepo> file never is in the top level dir (next to a C<.git/> dir).
+=item * A C<.gitrepo/config> file never is in the top level dir (next to a C<.git/> dir).
 
 =back
 
diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim
index 02f379b6..6a3f3de9 100644
--- a/doc/git-subrepo.swim
+++ b/doc/git-subrepo.swim
@@ -50,8 +50,8 @@ The `git-subrepo` command benefits these roles in the following ways:
 * Users get your repo and all your subrepos just by cloning your repo.
 * Users do not need to install `git-subrepo`, ever.
 * Collaborators do not need to install unless they want to push/pull.
-* Collaborators know when a subdir is a subrepo (it has a `.gitrepo` file).
-* The `.gitrepo` file never gets pushed back to the subrepo upstream.
+* Collaborators know when a subdir is a subrepo (it has a `.gitrepo/config` file).
+* The `.gitrepo/config` file never gets pushed back to the subrepo upstream.
 * Well named branches and remotes are generated for manual operations.
 * Owners do not deal with the complications of keeping submodules in sync.
 * Subrepo repositories can contain subrepos themselves.
@@ -100,7 +100,7 @@ the same arguments. Keep reading…
 
   The subrepo history is /squashed/ into a single commit that contains the
   reference information. This information is also stored in a special file
-  called `<subdir>/.gitrepo`. The presence of this file indicates that the
+  called `<subdir>/.gitrepo/config`. The presence of this file indicates that the
   directory is a subrepo.
 
   All subsequent commands refer to the subrepo by the name of the /subdir/.
@@ -123,13 +123,13 @@ the same arguments. Keep reading…
   this command will do that. It will split out the content of a normal
   subdirectory into a branch and start tracking it as a subrepo. Afterwards
   your original repo will look exactly the same except that there will be a
-  `<subdir>/.gitrepo` file.
+  `<subdir>/.gitrepo/config` file.
 
   If you specify the `--remote` (and optionally the `--branch`) option, the
-  values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
+  values will be added to the `<subdir>/.gitrepo/config` file. The `--remote` option
   is the upstream URL, and the `--branch` option is the upstream branch to push
   to. These values will be needed to do a `git subrepo push` command, but they
-  can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
+  can be provided later on the `push` command (and saved to `<subdir>/.gitrepo/config`
   if you also specify the `--update` option).
 
   Note: You will need to create the empty upstream repo and push to it on your
@@ -145,11 +145,11 @@ the same arguments. Keep reading…
   Update the subrepo subdir with the latest upstream changes.
 
   The `pull` command fetches the latest content from the remote branch pointed
-  to by the subrepo's `.gitrepo` file, and then tries to merge the changes into
+  to by the subrepo's `.gitrepo/config` file, and then tries to merge the changes into
   the corresponding subdir. It does this by making a branch of the local
   commits to the subdir and then merging or rebasing (see below) it with the
   fetched upstream content. After the merge, the content of the new branch
-  replaces your subdir, the `.gitrepo` file is updated and a single 'pull'
+  replaces your subdir, the `.gitrepo/config` file is updated and a single 'pull'
   commit is added to your mainline history.
 
   The `pull` command will attempt to do the following commands in one go:
@@ -295,9 +295,9 @@ the same arguments. Keep reading…
 
 - `git subrepo config <subdir> <option> [<value>] [-f]`
 
-  Read or update configuration values in the subdir/.gitrepo file.
+  Read or update configuration values in the subdir/.gitrepo/config file.
 
-  Because most of the values stored in the .gitrepo file are generated you
+  Because most of the values stored in the .gitrepo/config file are generated you
   will need to use `--force` if you want to change anything else then the
   `method` option.
 
@@ -359,7 +359,7 @@ the same arguments. Keep reading…
 - `--branch=<branch-name>` (`-b <branch-name>`)
 
   Use a different upstream branch-name than the remote HEAD or the one saved in
-  `.gitrepo` locally.
+  `.gitrepo/config` locally.
 
 - `--dry-run` (`-N`)
 
@@ -397,7 +397,7 @@ the same arguments. Keep reading…
 
 - `--remote=<remote-url>` (`-r <remote-url>`)
 
-  Use a different remote-url than the one saved in `.gitrepo` locally.
+  Use a different remote-url than the one saved in `.gitrepo/config` locally.
 
 - `--squash` (`-s`)
 
@@ -405,7 +405,7 @@ the same arguments. Keep reading…
 
 - `--update` (`-u`)
 
-  If `--branch` or `--remote` are used, and the command updates the `.gitrepo`
+  If `--branch` or `--remote` are used, and the command updates the `.gitrepo/config`
   file, include these values to the update.
 
 = Output Options
@@ -598,7 +598,7 @@ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
 * Works on various Windows environments. See "Windows" section above.
 * The `git-subrepo` repo itself has 2 subrepos under the `ext/` subdirectory.
 * Written in (very modern) Bash, with full test suite. Take a look.
-* A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
+* A `.gitrepo/config` file never is in the top level dir (next to a `.git/` dir).
 
 = Authors
 
diff --git a/doc/intro-to-subrepo.swim b/doc/intro-to-subrepo.swim
index 4a25bc2b..8433e2bf 100644
--- a/doc/intro-to-subrepo.swim
+++ b/doc/intro-to-subrepo.swim
@@ -194,7 +194,7 @@ Consider the equivalent subrepo commands:
   $ git subrepo pull foo
   $ git subrepo push foo
 
-Collaborators see a file called 'foo/.gitrepo', and know that the subdir is a
+Collaborators see a file called 'foo/.gitrepo/config', and know that the subdir is a
 subrepo. The file contains all the information needed by future commands
 applied to that subrepo.
 
@@ -255,7 +255,7 @@ Given this we do the following steps internally:
 * Read the remote head tree into the index
 * Checkout the index into the new subdir
 * Create a new subrepo commit object for the subdir content
-* Add a state file called .gitrepo to the new subrepo/subdir
+* Add a state file called .gitrepo/config to the new subrepo/subdir
 * Amend the merge commit with this new file
 
 This process adds something like this to the top of your history:
@@ -268,7 +268,7 @@ your history.  This is important as it keeps your history as clean as possible.
 You don't need to have the subrepo history in your main project, since it is
 immutably available elsewhere, and you have a pointer to that place.
 
-The new foo/.gitrepo file looks like this:
+The new foo/.gitrepo/config file looks like this:
 
   [subrepo]
           remote = git@github.com:you/foo.git
@@ -285,7 +285,7 @@ need this url to pull/push in the future.
 
 The next command is the pull command. Normally you just give it the subrepo's
 subdir path (although you can change the branch with -b), and it will get the
-other info from the subdir/.gitrepo file.
+other info from the subdir/.gitrepo/config file.
 
 The pull command does these steps:
 
@@ -294,7 +294,7 @@ The pull command does these steps:
 * Create a branch of local subrepo commits since last pull
 * Rebase this branch onto the upstream commits
 * Commit the HEAD of the rebased content
-* Update/amend the .gitrepo file
+* Update/amend the .gitrepo/config file
 
 === Clean History
 
diff --git a/lib/git-subrepo b/lib/git-subrepo
index 68918cbe..7f7caf44 100755
--- a/lib/git-subrepo
+++ b/lib/git-subrepo
@@ -71,7 +71,7 @@ M,method=   Method when you join, valid options are 'merge' or 'rebase'
 m,message=  Specify a commit message
 r,remote=   Specify the upstream remote to push/pull/fetch
 s,squash    Squash commits on push
-u,update    Add the --branch and/or --remote overrides to .gitrepo
+u,update    Add the --branch and/or --remote overrides to .gitrepo/config
 
 q,quiet     Show minimal output
 v,verbose   Show verbose output
@@ -94,7 +94,7 @@ main() {
   local force_wanted=false      # Force certain operations
   local fetch_wanted=false      # Fetch requested before a command
   local squash_wanted=false     # Squash commits on push
-  local update_wanted=false     # Update .gitrepo with --branch and/or --remote
+  local update_wanted=false     # Update .gitrepo/config with --branch and/or --remote
 
   local quiet_wanted=false      # Output should be quiet
   local verbose_wanted=false    # Output should be verbose
@@ -102,7 +102,7 @@ main() {
 
   local subdir=                 # Subdirectory of the subrepo being used
   local subref=                 # Valid git ref format of subdir
-  local gitrepo=                # Path to .gitrepo file
+  local gitrepo=                # Path to .gitrepo/config file
   local worktree=               # Worktree created by 'git worktree'
   local start_pwd=$(pwd)        # Store the original directory
 
@@ -503,10 +503,10 @@ subrepo:init() {
   # Check if subdir is proper candidate for this init:
   assert-subdir-ready-for-init
 
-  o "Put info into '$subdir/.gitrepo' file."
+  o "Put info into '$subdir/.gitrepo/config' file."
   update-gitrepo-file
 
-  o "Add the new '$subdir/.gitrepo' file."
+  o "Add the new '$subdir/.gitrepo/config' file."
   # -f from pull request #219. TODO needs test.
   RUN git add -f -- "$gitrepo"
 
@@ -590,7 +590,7 @@ subrepo:push() {
       fi
     else
       # Check that we are up to date:
-      o "Check upstream head against .gitrepo commit."
+      o "Check upstream head against .gitrepo/config commit."
       if ! $force_wanted; then
         if [[ $upstream_head_commit != $subrepo_commit ]]; then
           error "There are new changes upstream, you need to pull first."
@@ -665,7 +665,7 @@ subrepo:push() {
     git:delete-branch "$branch_name"
   fi
 
-  o "Put updates into '$subdir/.gitrepo' file."
+  o "Put updates into '$subdir/.gitrepo/config' file."
   upstream_head_commit="$new_upstream_head_commit"
   subrepo_commit_ref="$upstream_head_commit"
   update-gitrepo-file
@@ -675,7 +675,7 @@ subrepo:push() {
 # Fetch the subrepo's remote branch content:
 subrepo:fetch() {
   if [[ $subrepo_remote == none ]]; then
-    error "Can't fetch subrepo. Remote is 'none' in '$subdir/.gitrepo'."
+    error "Can't fetch subrepo. Remote is 'none' in '$subdir/.gitrepo/config'."
   fi
 
   o "Fetch the upstream: $subrepo_remote ($subrepo_branch)."
@@ -710,14 +710,14 @@ subrepo:branch() {
       o "Working on $commit"
 
       FAIL=false OUT=true RUN git config --blob \
-        "$commit":"$subdir/.gitrepo" "subrepo.commit"
+        "$commit":"$subdir/.gitrepo/config" "subrepo.commit"
       if [[ -z "$output" ]]; then
-        o "Ignore commit, no .gitrepo file"
+        o "Ignore commit, no .gitrepo/config file"
         continue
       fi
 
       local gitrepo_commit="$output"
-      o ".gitrepo reference commit: $gitrepo_commit"
+      o ".gitrepo/config reference commit: $gitrepo_commit"
 
 
       # Only include the commit if it's a child of the previous commit
@@ -793,11 +793,11 @@ subrepo:branch() {
       "$subref" "$branch"
   fi
 
-  o "Remove the .gitrepo file from $first_gitrepo_commit..$branch"
+  o "Remove the .gitrepo/config file from $first_gitrepo_commit..$branch"
   local filter="$branch"
   [[ -n "$first_gitrepo_commit" ]] && filter="$first_gitrepo_commit..$branch"
   FAIL=false RUN git filter-branch -f --prune-empty --tree-filter \
-    "rm -f .gitrepo" "$filter"
+    "rm -rf .gitrepo/config" "$filter"
 
   git:create-worktree "$branch"
 
@@ -828,7 +828,7 @@ subrepo:commit() {
   o "Put remote subrepo content into '$subdir/'."
   RUN git read-tree --prefix="$subdir" -u "$subrepo_commit_ref"
 
-  o "Put info into '$subdir/.gitrepo' file."
+  o "Put info into '$subdir/.gitrepo/config' file."
   update-gitrepo-file
   RUN git add -f -- "$gitrepo"
 
@@ -888,7 +888,7 @@ subrepo:status() {
     check-and-normalize-subdir
     encode-subdir
 
-    if [[ ! -f $subdir/.gitrepo ]]; then
+    if [[ ! -f $subdir/.gitrepo/config ]]; then
       echo "'$subdir' is not a subrepo"
       echo
       continue
@@ -1119,7 +1119,7 @@ command-setup() {
 
   check-and-normalize-subdir
   encode-subdir
-  gitrepo="$subdir/.gitrepo"
+  gitrepo="$subdir/.gitrepo/config"
 
   if ! $force_wanted; then
     o "Check for worktree with branch subrepo/$subdir"
@@ -1147,7 +1147,7 @@ Use the --force flag to override this check or remove the worktree with
   refs_subrepo_fetch="refs/subrepo/$subref/fetch"
   refs_subrepo_push="refs/subrepo/$subref/push"
 
-  # Read/parse the .gitrepo file (unless clone/init; doesn't exist yet)
+  # Read/parse the .gitrepo/config file (unless clone/init; doesn't exist yet)
   if [[ ! $command =~ ^(clone|init)$ ]]; then
     read-gitrepo-file
   fi
@@ -1293,18 +1293,18 @@ encode-subdir() {
 }
 
 #------------------------------------------------------------------------------
-# State file (`.gitrepo`) functions:
+# State file (`.gitrepo/config`) functions:
 #------------------------------------------------------------------------------
 
 # Set subdir and gitrepo vars:
 read-gitrepo-file() {
-  gitrepo="$subdir/.gitrepo"
+  gitrepo="$subdir/.gitrepo/config"
 
   if [[ ! -f $gitrepo ]]; then
     error "No '$gitrepo' file."
   fi
 
-  # Read .gitrepo values:
+  # Read .gitrepo/config values:
   if [[ -z $subrepo_remote ]]; then
     SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.remote
     subrepo_remote="$output"
@@ -1339,13 +1339,15 @@ read-gitrepo-file() {
 }
 
 
-# Update the subdir/.gitrepo state file:
+# Update the subdir/.gitrepo/config state file:
 update-gitrepo-file() {
   local short_commit=
 
   local newfile=false
   if [[ ! -e $gitrepo ]]; then
 
+    mkdir -p $(dirname "$gitrepo")
+
     FAIL=false RUN git cat-file -e "$original_head_commit":"$gitrepo"
 
     if OK; then
@@ -1481,7 +1483,7 @@ assert-subdir-ready-for-init() {
   if [[ ! -e $subdir ]]; then
     error "The subdir '$subdir' does not exist."
   fi
-  if [[ -e $subdir/.gitrepo ]]; then
+  if [[ -e $subdir/.gitrepo/config ]]; then
     error "The subdir '$subdir' is already a subrepo."
   fi
   # Check that subdir is part of the repo
@@ -1502,7 +1504,7 @@ assert-subdir-empty() {
 #------------------------------------------------------------------------------
 
 # Find all the current subrepos by looking for all the subdirectories that
-# contain a `.gitrepo` file.
+# contain a `.gitrepo/config` file.
 get-all-subrepos() {
   local paths=($(
     find . -name '.gitrepo' |
diff --git a/lib/git-subrepo.d/help-functions.bash b/lib/git-subrepo.d/help-functions.bash
index 10cda704..f4f7d62f 100644
--- a/lib/git-subrepo.d/help-functions.bash
+++ b/lib/git-subrepo.d/help-functions.bash
@@ -82,7 +82,7 @@ help:clone() {
 
   The subrepo history is /squashed/ into a single commit that contains the
   reference information. This information is also stored in a special file
-  called `<subdir>/.gitrepo`. The presence of this file indicates that the
+  called `<subdir>/.gitrepo/config`. The presence of this file indicates that the
   directory is a subrepo.
 
   All subsequent commands refer to the subrepo by the name of the /subdir/.
@@ -127,9 +127,9 @@ help:config() {
   Usage: git subrepo config <subdir> <option> [<value>] [-f]
 
 
-  Read or update configuration values in the subdir/.gitrepo file.
+  Read or update configuration values in the subdir/.gitrepo/config file.
 
-  Because most of the values stored in the .gitrepo file are generated you
+  Because most of the values stored in the .gitrepo/config file are generated you
   will need to use `--force` if you want to change anything else then the
   `method` option.
 
@@ -184,13 +184,13 @@ help:init() {
   this command will do that. It will split out the content of a normal
   subdirectory into a branch and start tracking it as a subrepo. Afterwards
   your original repo will look exactly the same except that there will be a
-  `<subdir>/.gitrepo` file.
+  `<subdir>/.gitrepo/config` file.
 
   If you specify the `--remote` (and optionally the `--branch`) option, the
-  values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
+  values will be added to the `<subdir>/.gitrepo/config` file. The `--remote` option
   is the upstream URL, and the `--branch` option is the upstream branch to push
   to. These values will be needed to do a `git subrepo push` command, but they
-  can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
+  can be provided later on the `push` command (and saved to `<subdir>/.gitrepo/config`
   if you also specify the `--update` option).
 
   Note: You will need to create the empty upstream repo and push to it on your
@@ -212,11 +212,11 @@ help:pull() {
   Update the subrepo subdir with the latest upstream changes.
 
   The `pull` command fetches the latest content from the remote branch pointed
-  to by the subrepo's `.gitrepo` file, and then tries to merge the changes into
+  to by the subrepo's `.gitrepo/config` file, and then tries to merge the changes into
   the corresponding subdir. It does this by making a branch of the local
   commits to the subdir and then merging or rebasing (see below) it with the
   fetched upstream content. After the merge, the content of the new branch
-  replaces your subdir, the `.gitrepo` file is updated and a single 'pull'
+  replaces your subdir, the `.gitrepo/config` file is updated and a single 'pull'
   commit is added to your mainline history.
 
   The `pull` command will attempt to do the following commands in one go:
diff --git a/man/man1/git-subrepo.1 b/man/man1/git-subrepo.1
index babcd951..203e671b 100644
--- a/man/man1/git-subrepo.1
+++ b/man/man1/git-subrepo.1
@@ -130,9 +130,9 @@ Users do not need to install \f(CW\*(C`git\-subrepo\*(C'\fR, ever.
 .IP "\(bu" 4
 Collaborators do not need to install unless they want to push/pull.
 .IP "\(bu" 4
-Collaborators know when a subdir is a subrepo (it has a \f(CW\*(C`.gitrepo\*(C'\fR file).
+Collaborators know when a subdir is a subrepo (it has a \f(CW\*(C`.gitrepo/config\*(C'\fR file).
 .IP "\(bu" 4
-The \f(CW\*(C`.gitrepo\*(C'\fR file never gets pushed back to the subrepo upstream.
+The \f(CW\*(C`.gitrepo/config\*(C'\fR file never gets pushed back to the subrepo upstream.
 .IP "\(bu" 4
 Well named branches and remotes are generated for manual operations.
 .IP "\(bu" 4
@@ -197,7 +197,7 @@ and merged into the subdir.
 .Sp
 The subrepo history is \fIsquashed\fR into a single commit that contains the
 reference information. This information is also stored in a special file
-called \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR. The presence of this file indicates that the
+called \f(CW\*(C`<subdir>/.gitrepo/config\*(C'\fR. The presence of this file indicates that the
 directory is a subrepo.
 .Sp
 All subsequent commands refer to the subrepo by the name of the
@@ -219,13 +219,13 @@ Turn an existing subdirectory into a subrepo.
 If you want to expose a subdirectory of your project as a published subrepo,
 this command will do that. It will split out the content of a normal
 subdirectory into a branch and start tracking it as a subrepo. Afterwards your
-original repo will look exactly the same except that there will be a \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR file.
+original repo will look exactly the same except that there will be a \f(CW\*(C`<subdir>/.gitrepo/config\*(C'\fR file.
 .Sp
 If you specify the \f(CW\*(C`\-\-remote\*(C'\fR (and optionally the \f(CW\*(C`\-\-branch\*(C'\fR) option, the
-values will be added to the \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR file. The \f(CW\*(C`\-\-remote\*(C'\fR
+values will be added to the \f(CW\*(C`<subdir>/.gitrepo/config\*(C'\fR file. The \f(CW\*(C`\-\-remote\*(C'\fR
 option is the upstream \s-1URL,\s0 and the \f(CW\*(C`\-\-branch\*(C'\fR option is the upstream branch
 to push to. These values will be needed to do a \f(CW\*(C`git subrepo push\*(C'\fR command,
-but they can be provided later on the \f(CW\*(C`push\*(C'\fR command (and saved to \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR if you also specify the \f(CW\*(C`\-\-update\*(C'\fR option).
+but they can be provided later on the \f(CW\*(C`push\*(C'\fR command (and saved to \f(CW\*(C`<subdir>/.gitrepo/config\*(C'\fR if you also specify the \f(CW\*(C`\-\-update\*(C'\fR option).
 .Sp
 Note: You will need to create the empty upstream repo and push to it on your
       own, using \f(CW\*(C`git subrepo push <subdir>\*(C'\fR.
@@ -240,11 +240,11 @@ The \f(CW\*(C`init\*(C'\fR command accepts the \f(CW\*(C`\-\-branch=\*(C'\fR and
 Update the subrepo subdir with the latest upstream changes.
 .Sp
 The \f(CW\*(C`pull\*(C'\fR command fetches the latest content from the remote branch pointed
-to by the subrepo's \f(CW\*(C`.gitrepo\*(C'\fR file, and then tries to merge the changes into
+to by the subrepo's \f(CW\*(C`.gitrepo/config\*(C'\fR file, and then tries to merge the changes into
 the corresponding subdir. It does this by making a branch of the local commits
 to the subdir and then merging or rebasing (see below) it with the fetched
 upstream content. After the merge, the content of the new branch replaces your
-subdir, the \f(CW\*(C`.gitrepo\*(C'\fR file is updated and a single 'pull' commit is added to
+subdir, the \f(CW\*(C`.gitrepo/config\*(C'\fR file is updated and a single 'pull' commit is added to
 your mainline history.
 .Sp
 The \f(CW\*(C`pull\*(C'\fR command will attempt to do the following commands in one go:
@@ -398,9 +398,9 @@ The \f(CW\*(C`clean\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW
 .ie n .IP """git subrepo config <subdir> <option> [<value>] [\-f]""" 4
 .el .IP "\f(CWgit subrepo config <subdir> <option> [<value>] [\-f]\fR" 4
 .IX Item "git subrepo config <subdir> <option> [<value>] [-f]"
-Read or update configuration values in the subdir/.gitrepo file.
+Read or update configuration values in the subdir/.gitrepo/config file.
 .Sp
-Because most of the values stored in the .gitrepo file are generated you
+Because most of the values stored in the .gitrepo/config file are generated you
 will need to use \f(CW\*(C`\-\-force\*(C'\fR if you want to change anything else then the
 \&\f(CW\*(C`method\*(C'\fR option.
 .Sp
@@ -465,7 +465,7 @@ commands that \f(CW\*(C`\-\-all\*(C'\fR works for.
 .el .IP "\f(CW\-\-branch=<branch\-name>\fR (\f(CW\-b <branch\-name>\fR)" 4
 .IX Item "--branch=<branch-name> (-b <branch-name>)"
 Use a different upstream branch-name than the remote \s-1HEAD\s0 or the one saved in
-\&\f(CW\*(C`.gitrepo\*(C'\fR locally.
+\&\f(CW\*(C`.gitrepo/config\*(C'\fR locally.
 .ie n .IP """\-\-dry\-run"" (""\-N"")" 4
 .el .IP "\f(CW\-\-dry\-run\fR (\f(CW\-N\fR)" 4
 .IX Item "--dry-run (-N)"
@@ -503,7 +503,7 @@ setup for push).
 .ie n .IP """\-\-remote=<remote\-url>"" (""\-r <remote\-url>"")" 4
 .el .IP "\f(CW\-\-remote=<remote\-url>\fR (\f(CW\-r <remote\-url>\fR)" 4
 .IX Item "--remote=<remote-url> (-r <remote-url>)"
-Use a different remote-url than the one saved in \f(CW\*(C`.gitrepo\*(C'\fR locally.
+Use a different remote-url than the one saved in \f(CW\*(C`.gitrepo/config\*(C'\fR locally.
 .ie n .IP """\-\-squash"" (""\-s"")" 4
 .el .IP "\f(CW\-\-squash\fR (\f(CW\-s\fR)" 4
 .IX Item "--squash (-s)"
@@ -512,7 +512,7 @@ Squash all commits on a push into one new commit.
 .el .IP "\f(CW\-\-update\fR (\f(CW\-u\fR)" 4
 .IX Item "--update (-u)"
 If \f(CW\*(C`\-\-branch\*(C'\fR or \f(CW\*(C`\-\-remote\*(C'\fR are used, and the command updates the
-\&\f(CW\*(C`.gitrepo\*(C'\fR file, include these values to the update.
+\&\f(CW\*(C`.gitrepo/config\*(C'\fR file, include these values to the update.
 .SH "Output Options"
 .IX Header "Output Options"
 .ie n .IP """\-\-quiet"" (""\-q"")" 4
@@ -733,7 +733,7 @@ The \f(CW\*(C`git\-subrepo\*(C'\fR repo itself has 2 subrepos under the \f(CW\*(
 .IP "\(bu" 4
 Written in (very modern) Bash, with full test suite. Take a look.
 .IP "\(bu" 4
-A \f(CW\*(C`.gitrepo\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
+A \f(CW\*(C`.gitrepo/config\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
 .SH "Authors"
 .IX Header "Authors"
 .IP "\(bu" 4
diff --git a/note/Story1 b/note/Story1
index 0dd81ceb..c56e3cdb 100644
--- a/note/Story1
+++ b/note/Story1
@@ -5,7 +5,7 @@
 - create local branch repo/genius
 - checkout repo/genius into ext/genius
 - SYNC-DANCE:
-  - add ext/genius/.gitrepo
+  - add ext/genius/.gitrepo/config
   - commit the add and prune the commit
   - merge the pruned commit into mianline
 
@@ -20,7 +20,7 @@
 
 == git subrepo branch ext/genius
 - filter-branch subdir ext/genius
-- filter-branch 'rm .gitrepo'
+- filter-branch 'rm -rf .gitrepo/config'
 - add parent of original
 - name the commit subrepo/ext/genius
 
diff --git a/note/ToDo b/note/ToDo
index a08ae793..dfc3bef5 100644
--- a/note/ToDo
+++ b/note/ToDo
@@ -6,7 +6,7 @@
 
 == Development
 
-- Add version commit id to cmdver in .gitrepo.
+- Add version commit id to cmdver in .gitrepo/config.
   - Update Makefile to install:
     - git-subrepo.d/remote
     - git-subrepo.d/commit
@@ -28,7 +28,7 @@
 - Update VERSION to 0.1.1
   - Tag when ready.
 
-- When .gitrepo is stable:
+- When .gitrepo/config is stable:
   - Delete and re-clone all subrepos in all repos using them
 
 - Rewrite the Intro doc.
diff --git a/note/design.swim b/note/design.swim
index bc439f77..1d7e036a 100644
--- a/note/design.swim
+++ b/note/design.swim
@@ -9,7 +9,7 @@ Glossary:
 - `subdir` :: The directory in the work tree where the subrepo lives
 - `upstream` :: The remote repo that the subrepo is tracking
 - `local` :: The local parts of the subrepo
-- `.gitrepo` :: The subrepo state file
+- `.gitrepo/config` :: The subrepo state file
 - `remote` :: The subrepo url
 - `branch` :: The remote branch the subrepo is tracking
 - `commit` ::  The upstream commit id that we last synced to
@@ -38,8 +38,8 @@ Steps:
 * Subtree merge the remote subrepo history into the subdir
 * Squash the history to a single commit
 * Merge the subtree commit into the mainline HEAD
-* Add a .gitrepo file to the subdir
-* Amend the .gitrepo into the HEAD merge commit
+* Add a .gitrepo/config file to the subdir
+* Amend the .gitrepo/config into the HEAD merge commit
 * Create a branch .git/refs/subrepo/remote/<subdir>
 * Add a remote called subrepo/<subdir>
 
@@ -78,8 +78,8 @@ Steps:
     git subrepo clone <remote> <subdir>
 * Squash the upstream history
 * Merge the subtree into mainline
-* Update the .gitrepo file
-* Amend .gitrepo into HEAD
+* Update the .gitrepo/config file
+* Amend .gitrepo/config into HEAD
 * Delete the subrepo/<subdir> branch
 
 == push
diff --git a/note/design2.swim b/note/design2.swim
index 90121187..caed077c 100644
--- a/note/design2.swim
+++ b/note/design2.swim
@@ -9,7 +9,7 @@ Glossary:
 - `subdir` :: The directory in the work tree where the subrepo lives
 - `upstream` :: The remote repo that the subrepo is tracking
 - `local` :: The local parts of the subrepo
-- `.gitrepo` :: The subrepo state file
+- `.gitrepo/config` :: The subrepo state file
 - `remote` :: The subrepo url
 - `branch` :: The remote branch the subrepo is tracking
 - `commit` ::  The upstream commit id that we last synced to
@@ -32,7 +32,7 @@ There are 4 main commands:
   # Single command pull:
   git subrepo pull --rebase ext/foo
   git subrepo pull --merge  ext/foo -b remote-branch
-  git subrepo pull --ours   ext/foo -B remote-branch  # change .gitrepo
+  git subrepo pull --ours   ext/foo -B remote-branch  # change .gitrepo/config
   git subrepo pull --rebase --all
 
   # Manual pull:
@@ -75,7 +75,7 @@ There are certain steps that each command must do first:
 * Assert the command arguments are valid.
 * Assert the subdir is a valid subrepo dir.
   * For `clone` make sure subdir does not exist yet.
-* Read the .gitrepo file (not for clone).
+* Read the .gitrepo/config file (not for clone).
 * For `clone`, make sure we know what upstream branch to use.
 * Note the starting point (branch and commit).
 
diff --git a/note/init-test b/note/init-test
index a20854de..d1d78b75 100755
--- a/note/init-test
+++ b/note/init-test
@@ -18,7 +18,7 @@ git hub clone "$REPO"
   git subrepo init test -r "git@github.com:$SUBREPO" # -b foo
   git hub repo-new "$SUBREPO"
   git hub repo "$SUBREPO"
-  cat "$SUBDIR/.gitrepo"
+  cat "$SUBDIR/.gitrepo/config"
   git subrepo push "$SUBDIR"
   git subrepo status "$SUBDIR"
   git hub clone "$SUBREPO"
@@ -29,7 +29,7 @@ git hub clone "$REPO"
   git subrepo init test
   git hub repo-new "$SUBREPO"
   git hub repo "$SUBREPO"
-  cat "$SUBDIR/.gitrepo"
+  cat "$SUBDIR/.gitrepo/config"
   git subrepo push -u "$SUBDIR" -r "git@github.com:$SUBREPO" -b foo
   git subrepo status "$SUBDIR"
   git hub clone "$SUBREPO"
diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo
index fc82be20..400de04c 100644
--- a/share/zsh-completion/_git-subrepo
+++ b/share/zsh-completion/_git-subrepo
@@ -29,7 +29,7 @@ _git-subrepo() {
         '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
         '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
         '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
-        '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \
+        '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo/config]' \
         '(-q --quiet)'{-q,--quiet}'[Show minimal output]' \
         '(-v --verbose)'{-v,--verbose}'[Show verbose output]' \
         '(-d --debug)'{-d,--debug}'[Show the actual commands used]' \
diff --git a/test/branch.t b/test/branch.t
index 40a912e3..3d889a53 100644
--- a/test/branch.t
+++ b/test/branch.t
@@ -15,7 +15,7 @@ before="$(date -r $OWNER/foo/Foo '+%s')"
 (
   cd $OWNER/foo
   add-new-files bar/file
-  add-new-files .gitrepo
+  add-new-files .gitrepo/config
 )
 
 save-original-state $OWNER/foo bar
diff --git a/test/clone.t b/test/clone.t
index ccfd6ab2..c900e80c 100644
--- a/test/clone.t
+++ b/test/clone.t
@@ -60,7 +60,7 @@ clone-foo-and-bar
 }
 
 # Check that subrepo files look ok:
-gitrepo=$OWNER/foo/bar/.gitrepo
+gitrepo=$OWNER/foo/bar/.gitrepo/config
 {
   test-exists \
     "$OWNER/foo/bar/" \
@@ -69,7 +69,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
     "!$OWNER/empty/bar/"
 }
 
-# Test foo/bar/.gitrepo file contents:
+# Test foo/bar/.gitrepo/config file contents:
 {
   foo_clone_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
diff --git a/test/config.t b/test/config.t
index 0905127f..12dceec0 100644
--- a/test/config.t
+++ b/test/config.t
@@ -8,14 +8,14 @@ use Test::More
 
 git clone $UPSTREAM/init $OWNER/init &>/dev/null
 
-gitrepo=$OWNER/init/doc/.gitrepo
+gitrepo=$OWNER/init/doc/.gitrepo/config
 
 (
   cd "$OWNER/init"
   git subrepo init doc
 ) > /dev/null
 
-# Test init/doc/.gitrepo file contents:
+# Test init/doc/.gitrepo/config file contents:
 {
   test-gitrepo-field "remote" "none"
   test-gitrepo-field "branch" "master"
diff --git a/test/error.t b/test/error.t
index 0e3100d3..bb89469f 100644
--- a/test/error.t
+++ b/test/error.t
@@ -97,7 +97,7 @@ clone-foo-and-bar
       cd $OWNER/bar
       catch git subrepo pull lala
     )" \
-    "git-subrepo: No 'lala/.gitrepo' file." \
+    "git-subrepo: No 'lala/.gitrepo/config' file." \
     "Error OK: check for valid subrepo subdir"
 }
 
diff --git a/test/gitignore.t b/test/gitignore.t
index a1975aaf..6e768232 100644
--- a/test/gitignore.t
+++ b/test/gitignore.t
@@ -37,14 +37,14 @@ subrepo-clone-bar-into-foo
 }
 
 # Test subrepo file content:
-gitrepo=$OWNER/foo/bar/.gitrepo
+gitrepo=$OWNER/foo/bar/.gitrepo/config
 {
   test-exists \
     "$OWNER/foo/bar/Bar2" \
     "$gitrepo"
 }
 
-# Test foo/bar/.gitrepo file contents:
+# Test foo/bar/.gitrepo/config file contents:
 {
   foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
diff --git a/test/init.t b/test/init.t
index 0651754b..ef4196e6 100644
--- a/test/init.t
+++ b/test/init.t
@@ -8,7 +8,7 @@ use Test::More
 
 git clone $UPSTREAM/init $OWNER/init &>/dev/null
 
-gitrepo=$OWNER/init/doc/.gitrepo
+gitrepo=$OWNER/init/doc/.gitrepo/config
 
 # Test that the initial repo look ok:
 {
@@ -33,7 +33,7 @@ is "$output" "Subrepo created from 'doc' (with no remote)." \
     "$gitrepo"
 }
 
-# Test init/doc/.gitrepo file contents:
+# Test init/doc/.gitrepo/config file contents:
 {
   init_clone_commit="$(cd $OWNER/init; git rev-parse HEAD^)"
   test-gitrepo-comment-block
diff --git a/test/pull-merge.t b/test/pull-merge.t
index 285a798b..9d0c912c 100644
--- a/test/pull-merge.t
+++ b/test/pull-merge.t
@@ -18,8 +18,8 @@ note "Pull - Conflict - Merge ours/theirs - Push"
   git push
 ) &> /dev/null || die
 
-gitrepo=$OWNER/foo/bar/.gitrepo
-# Test foo/bar/.gitrepo file contents:
+gitrepo=$OWNER/foo/bar/.gitrepo/config
+# Test foo/bar/.gitrepo/config file contents:
 {
   foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD^)"
@@ -71,7 +71,7 @@ is "$(cat $OWNER/foo/bar/Bar2)" \
       "subrepo pull should have merge message"
 }
 
-# Test foo/bar/.gitrepo file contents:
+# Test foo/bar/.gitrepo/config file contents:
 {
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
   test-gitrepo-field "commit" "$bar_head_commit"
diff --git a/test/pull-new-branch.t b/test/pull-new-branch.t
index d3a8703e..bdf64a59 100644
--- a/test/pull-new-branch.t
+++ b/test/pull-new-branch.t
@@ -15,7 +15,7 @@ subrepo-clone-bar-into-foo
 ) &> /dev/null || die
 
 # Test subrepo file content:
-gitrepo=$OWNER/foo/bar/.gitrepo
+gitrepo=$OWNER/foo/bar/.gitrepo/config
 
 {
   foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
diff --git a/test/pull.t b/test/pull.t
index 24fb76d1..de9bc771 100644
--- a/test/pull.t
+++ b/test/pull.t
@@ -28,14 +28,14 @@ subrepo-clone-bar-into-foo
 }
 
 # Test subrepo file content:
-gitrepo=$OWNER/foo/bar/.gitrepo
+gitrepo=$OWNER/foo/bar/.gitrepo/config
 {
   test-exists \
     "$OWNER/foo/bar/Bar2" \
     "$gitrepo"
 }
 
-# Test foo/bar/.gitrepo file contents:
+# Test foo/bar/.gitrepo/config file contents:
 {
   foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
diff --git a/test/push-after-init.t b/test/push-after-init.t
index c48a04c9..2c4f8b01 100644
--- a/test/push-after-init.t
+++ b/test/push-after-init.t
@@ -28,8 +28,8 @@ output="$(
 is "$output" "Subrepo 'doc' pushed to '../upstream' (master)." \
   'Command output is correct'
 
-# Test init/doc/.gitrepo file contents:
-gitrepo=$OWNER/init/doc/.gitrepo
+# Test init/doc/.gitrepo/config file contents:
+gitrepo=$OWNER/init/doc/.gitrepo/config
 {
   test-gitrepo-field "remote" "../upstream"
   test-gitrepo-field "branch" "master"
@@ -43,7 +43,7 @@ gitrepo=$OWNER/init/doc/.gitrepo
 {
   test-exists \
     "$OWNER/up/.git/" \
-    "!$OWNER/up/.gitrepo"
+    "!$OWNER/up/.gitrepo/config"
 }
 
 done_testing
diff --git a/test/push-squash.t b/test/push-squash.t
index b1438443..82fdd2e3 100644
--- a/test/push-squash.t
+++ b/test/push-squash.t
@@ -49,7 +49,7 @@ test-exists \
   "$OWNER/bar/Bar" \
   "$OWNER/bar/FooBar1" \
   "$OWNER/bar/FooBar2" \
-  "!$OWNER/bar/.gitrepo" \
+  "!$OWNER/bar/.gitrepo/config" \
 
 done_testing
 
diff --git a/test/push.t b/test/push.t
index 6ee48f86..6e75f9c0 100644
--- a/test/push.t
+++ b/test/push.t
@@ -78,8 +78,8 @@ clone-foo-and-bar
 # Check that all commits arrived in subrepo
 test-commit-count "$OWNER/bar" HEAD 7
 
-# Test foo/bar/.gitrepo file contents:
-gitrepo=$OWNER/foo/bar/.gitrepo
+# Test foo/bar/.gitrepo/config file contents:
+gitrepo=$OWNER/foo/bar/.gitrepo/config
 {
   foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
   bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
@@ -120,7 +120,7 @@ test-exists \
   "$OWNER/bar/FooBar" \
   "$OWNER/bar/bard/" \
   "$OWNER/bar/bargy" \
-  "!$OWNER/bar/.gitrepo" \
+  "!$OWNER/bar/.gitrepo/config" \
 
 (
   # In the main repo:
diff --git a/test/setup b/test/setup
index 706a2e69..29180141 100644
--- a/test/setup
+++ b/test/setup
@@ -156,7 +156,7 @@ test-gitrepo-comment-block() {
 test-gitrepo-field() {
   is "`git config -f $gitrepo subrepo.$1`" \
     "$2" \
-    ".gitrepo $1 is correct"
+    ".gitrepo/config $1 is correct"
 }
 
 test-commit-count() {
@@ -169,14 +169,14 @@ save-original-state() {
   original_head_ref="$(cd $1; cat .git/HEAD)"
   original_branch="${original_head_ref#ref: refs/heads/}"
   original_head_commit="$(cd $1; git rev-parse HEAD)"
-  original_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  original_gitrepo="$(cd $1; cat $2/.gitrepo/config)"
 }
 
 assert-original-state() {
   current_head_ref="$(cd $1; cat .git/HEAD)"
   current_branch="${current_head_ref#ref: refs/heads/}"
   current_head_commit="$(cd $1; git rev-parse HEAD)"
-  current_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  current_gitrepo="$(cd $1; cat $2/.gitrepo/config)"
 
   is "$current_head_ref" \
     "$original_head_ref" \
@@ -192,7 +192,7 @@ assert-original-state() {
 
   is "$current_gitrepo" \
     "$original_gitrepo" \
-    "$2/.gitrepo has not changed"
+    "$2/.gitrepo/config has not changed"
 }
 
 catch() {

From 131951f181134628689bd49535cf5c453ed2b640 Mon Sep 17 00:00:00 2001
From: kx <kx@radix.pro>
Date: Wed, 14 Nov 2018 08:55:30 +0300
Subject: [PATCH 3/4] Update subrepos of external projects according to new
 place of .gitrepo config file

---
 ext/bashplus/{.gitrepo => .gitrepo/config}                        | 0
 ext/test-more-bash/{.gitrepo => .gitrepo/config}                  | 0
 ext/test-more-bash/ext/bashplus/{.gitrepo => .gitrepo/config}     | 0
 .../ext/test-tap-bash/{.gitrepo => .gitrepo/config}               | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename ext/bashplus/{.gitrepo => .gitrepo/config} (100%)
 rename ext/test-more-bash/{.gitrepo => .gitrepo/config} (100%)
 rename ext/test-more-bash/ext/bashplus/{.gitrepo => .gitrepo/config} (100%)
 rename ext/test-more-bash/ext/test-tap-bash/{.gitrepo => .gitrepo/config} (100%)

diff --git a/ext/bashplus/.gitrepo b/ext/bashplus/.gitrepo/config
similarity index 100%
rename from ext/bashplus/.gitrepo
rename to ext/bashplus/.gitrepo/config
diff --git a/ext/test-more-bash/.gitrepo b/ext/test-more-bash/.gitrepo/config
similarity index 100%
rename from ext/test-more-bash/.gitrepo
rename to ext/test-more-bash/.gitrepo/config
diff --git a/ext/test-more-bash/ext/bashplus/.gitrepo b/ext/test-more-bash/ext/bashplus/.gitrepo/config
similarity index 100%
rename from ext/test-more-bash/ext/bashplus/.gitrepo
rename to ext/test-more-bash/ext/bashplus/.gitrepo/config
diff --git a/ext/test-more-bash/ext/test-tap-bash/.gitrepo b/ext/test-more-bash/ext/test-tap-bash/.gitrepo/config
similarity index 100%
rename from ext/test-more-bash/ext/test-tap-bash/.gitrepo
rename to ext/test-more-bash/ext/test-tap-bash/.gitrepo/config

From 64f17801c520a02c4dbe12de95d986bdf8e27852 Mon Sep 17 00:00:00 2001
From: kx <kx@radix.pro>
Date: Wed, 14 Nov 2018 10:19:51 +0300
Subject: [PATCH 4/4] Enable file names with spaces and minuses

---
 lib/git-subrepo | 4 ++--
 test/setup      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/git-subrepo b/lib/git-subrepo
index 7f7caf44..1381c230 100755
--- a/lib/git-subrepo
+++ b/lib/git-subrepo
@@ -1344,9 +1344,9 @@ update-gitrepo-file() {
   local short_commit=
 
   local newfile=false
-  if [[ ! -e $gitrepo ]]; then
+  if [[ ! -e "$gitrepo" ]]; then
 
-    mkdir -p $(dirname "$gitrepo")
+    mkdir -p -- "$(dirname -- "$gitrepo")"
 
     FAIL=false RUN git cat-file -e "$original_head_commit":"$gitrepo"
 
diff --git a/test/setup b/test/setup
index 29180141..9967f36a 100644
--- a/test/setup
+++ b/test/setup
@@ -65,6 +65,7 @@ subrepo-clone-bar-into-foo() {
 add-new-files() {
   local file
   for file in $*; do
+    mkdir -p -- "$(dirname -- "$file")"
     echo "new file $file" > "$file"
     git add "$file"
   done