summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2009-02-14 23:21:04 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-14 21:27:35 -0800
commit900569661bbfe5c0e56cf8b9c014a2f594bb174c (patch)
tree5503cded7e3af1fe7c8b56ea295109cc4c30220c /rerere.h
parente9cc02f0e41fd5d2f51e3c3f2b4f8cfa9e434432 (diff)
downloadgit-900569661bbfe5c0e56cf8b9c014a2f594bb174c.tar.gz
rerere: remove duplicated functions
Both rerere.c and builtin-rerere.c define the static functions rr_path() and has_resolution() the exact same way. To eliminate this code duplication this patch turns the functions in rerere.c non-static, and makes builtin-rerere.c use them. Also, since this puts these two functions into the global namespace, rename them to rerere_path() and has_rerere_resolution(), respectively, and rename their "name" parameter to "hex", because it better reflects what that parameter actually is. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
-rw-r--r--rerere.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/rerere.h b/rerere.h
index f9b03862fe..13313f3f2b 100644
--- a/rerere.h
+++ b/rerere.h
@@ -5,5 +5,7 @@
extern int setup_rerere(struct string_list *);
extern int rerere(void);
+extern const char *rerere_path(const char *hex, const char *file);
+extern int has_rerere_resolution(const char *hex);
#endif