delta/git.git, branch sb/submodule-intern-gitdir

submodule: add embed-git-dir function

2016-12-01T22:44:40+00:00

When a submodule has its git dir inside the working dir, the submodule
support for checkout that we plan to add in a later patch will fail.

Add functionality to migrate the git directory to be embedded
into the superprojects git directory.

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

worktree: get worktrees from submodules

2016-12-01T22:44:40+00:00

In a later patch we want to move around the the git directory of
a submodule. Both submodules as well as worktrees are involved in
placing git directories at unusual places, so their functionality
may collide. To react appropriately to situations where worktrees
in submodules are in use, offer a new function to query the
worktrees for submodules.

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

test-lib-functions.sh: teach test_commit -C

2016-11-22T22:41:12+00:00

Specifically when setting up submodule tests, it comes in handy if
we can create commits in repositories that are not at the root of
the tested trash dir. Add "-C " similar to gits -C parameter
that will perform the operation in the given directory.

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

submodule helper: support super prefix

2016-11-22T22:41:12+00:00

Just like main commands in Git, the submodule helper needs
access to the superproject prefix. Enable this in the git.c
but have its own fuse in the helper code by having a flag to
turn on the super prefix.

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

submodule: use absolute path for computing relative path connecting

2016-11-22T22:41:12+00:00

The current caller of connect_work_tree_and_git_dir passes
an absolute path for the `git_dir` parameter. In the future patch
we will also pass in relative path for `git_dir`. Extend the functionality
of connect_work_tree_and_git_dir to take relative paths for parameters.

We could work around this in the future patch by computing the absolute
path for the git_dir in the calling site, however accepting relative
paths for either parameter makes the API for this function much harder
to misuse.

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

Git 2.11-rc2

2016-11-17T21:47:36+00:00

Signed-off-by: Junio C Hamano

Merge branch 'tk/diffcore-delta-remove-unused'

2016-11-17T21:45:22+00:00

Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()

Merge branch 'jk/create-branch-remove-unused-param'

2016-11-17T21:45:21+00:00

Code clean-up.

* jk/create-branch-remove-unused-param:
  create_branch: drop unused "head" parameter

Merge branch 'nd/worktree-lock'

2016-11-17T21:45:21+00:00

Typofix.

* nd/worktree-lock:
  git-worktree.txt: fix typo "to"/"two", and add comma

diffcore-delta: remove unused parameter to diffcore_count_changes()

2016-11-14T17:24:04+00:00

The delta_limit parameter to diffcore_count_changes() has been unused
since commit ba23bbc8e ("diffcore-delta: make change counter to byte
oriented again.", 2006-03-04).

Remove the parameter and adjust all callers.

Signed-off-by: Tobias Klauser 
Signed-off-by: Junio C Hamano