X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=submodule.h;h=80e04f3c8cfe9a49865ef54f61efaa3bc67dca5c;hb=b52ab19d91015ebd6bebc83a82b2c3d64b948b36;hp=5350b0d5a0d16e12e96b983e6510cb1d4098f962;hpb=6d1cdadbeeb03f40250526e29b1f1a91582911d8;p=git.git

diff --git a/submodule.h b/submodule.h
index 5350b0d5a..80e04f3c8 100644
--- a/submodule.h
+++ b/submodule.h
@@ -28,6 +28,7 @@ int fetch_populated_submodules(int num_options, const char **options,
 			       int quiet);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
 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]);
+		    const unsigned char a[20], const unsigned char b[20], int search);
+int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
 
 #endif