config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

[thirdparty/git.git] / path.h

diff --git a/path.h b/path.h
index 1f1bf8f87a86d4444879d3fdc0a30076b2c111f3..e7e77da6aaa5cf8e4652141ecf785ee18effeaca 100644 (file)
--- a/path.h
+++ b/path.h
@@ -170,8 +170,6 @@ void report_linked_checkout_garbage(void);
        }
 
 struct path_cache {
-       const char *cherry_pick_head;
-       const char *revert_head;
        const char *squash_msg;
        const char *merge_msg;
        const char *merge_rr;
@@ -182,10 +180,11 @@ struct path_cache {
        const char *shallow;
 };
 
-#define PATH_CACHE_INIT { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+#define PATH_CACHE_INIT                                        \
+       {                                                      \
+               NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
+       }
 
-const char *git_path_cherry_pick_head(struct repository *r);
-const char *git_path_revert_head(struct repository *r);
 const char *git_path_squash_msg(struct repository *r);
 const char *git_path_merge_msg(struct repository *r);
 const char *git_path_merge_rr(struct repository *r);