From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Jan 2017 23:24:27 +0000 (-0800)
Subject: Merge branch 'sb/submodule-embed-gitdir'
X-Git-Tag: v2.12.0-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da2b74eeec0b12d7b20d34a5e284295f81ad40a8;p=thirdparty%2Fgit.git

Merge branch 'sb/submodule-embed-gitdir'

A new submodule helper "git submodule embedgitdirs" to make it
easier to move embedded .git/ directory for submodules in a
superproject to .git/modules/ (and point the latter with the former
that is turned into a "gitdir:" file) has been added.

* sb/submodule-embed-gitdir:
  worktree: initialize return value for submodule_uses_worktrees
  submodule: add absorb-git-dir function
  move connect_work_tree_and_git_dir to dir.h
  worktree: check if a submodule uses worktrees
  test-lib-functions.sh: teach test_commit -C <dir>
  submodule helper: support super prefix
  submodule: use absolute path for computing relative path connecting
---

da2b74eeec0b12d7b20d34a5e284295f81ad40a8
diff --cc submodule.h
index 23d76682b1,6229054b99..b7576d6f43
--- a/submodule.h
+++ b/submodule.h
@@@ -63,12 -62,9 +63,11 @@@ int submodule_uses_gitfile(const char *
  int ok_to_remove_submodule(const char *path);
  int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
  		    const unsigned char a[20], const unsigned char b[20], int search);
 -int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
 +int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_name,
  		struct string_list *needs_pushing);
 -int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
 +extern int push_unpushed_submodules(struct sha1_array *commits,
 +				    const char *remotes_name,
 +				    int dry_run);
- void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
  int parallel_submodules(void);
  
  /*