delta/git.git, branch sb/submodule-update-dot-branch

t7406: fix breakage on OSX

2016-08-10T18:27:22+00:00

On OSX `wc` prefixes the output of numbers with whitespace, such
that the `commit_count` would be "SP ". When using that in

    git submodule update --init --depth=$commit_count

the depth would be empty and the number is interpreted as the
pathspec.  Fix this by not using `wc` and rather instruct rev-list
to count.

Another way to fix this is to remove the `=` sign after the
`--depth` argument as then we are allowed to have more than just one
whitespace between `--depth` and the actual number.  Prefer the
solution of rev-list counting as that is expected to be slightly
faster and more self-contained within Git.

Reported-by: Lars Schneider 
Helped-by: Junio C Hamano ,
Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule update: allow '.' for branch value

2016-08-03T23:13:22+00:00

Gerrit has a "superproject subscription" feature[1], that triggers a
commit in a superproject that is subscribed to its submodules.
Conceptually this Gerrit feature can be done on the client side with
Git via (except for raciness, error handling etc):

  while [ true ]; do
    git -C  submodule update --remote --force
    git -C  commit -a -m "Update submodules"
    git -C  push
  done

for each branch in the superproject. To ease the configuration in Gerrit
a special value of "." has been introduced for the submodule..branch
to mean the same branch as the superproject[2], such that you can create a
new branch on both superproject and the submodule and this feature
continues to work on that new branch.

Now we find projects in the wild with such a .gitmodules file.
The .gitmodules used in these Gerrit projects do not conform
to Gits understanding of how .gitmodules should look like.
This teaches Git to deal gracefully with this syntax as well.

The redefinition of "." does no harm to existing projects unaware of
this change, as "." is an invalid branch name in Git, so we do not
expect such projects to exist.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule--helper: add remote-branch helper

2016-08-03T23:11:35+00:00

In a later patch we want to enhance the logic for the branch selection.
Rewrite the current logic to be in C, so we can directly use C when
we enhance the logic.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule-config: keep configured branch around

2016-08-01T21:42:07+00:00

The branch field will be used in a later patch by `submodule update`.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule--helper: fix usage string for relative-path

2016-08-01T21:41:53+00:00

Internally we call the underscore version of relative_path, but externally
we present an API with no underscores.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule update: narrow scope of local variable

2016-08-01T21:41:51+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

submodule update: respect depth in subsequent fetches

2016-08-01T21:41:02+00:00

When depth is given the user may have a reasonable expectation that
any remote operation is using the given depth. Add a test to demonstrate
we still get the desired sha1 even if the depth is too short to
include the actual commit.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

t7406: future proof tests with hard coded depth

2016-08-01T21:40:56+00:00

The prior hard coded depth was chosen to be exactly the length from the
recorded gitlink to the tip of the remote, so if you add more commits
to the remote before, this test will not test its intention any more.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Sync with maint

2016-07-28T21:21:18+00:00

* maint:
  Some fixes for 2.9.3

Eighth batch of topics for 2.10

2016-07-28T21:20:48+00:00

Signed-off-by: Junio C Hamano