@matheusbsbs / matheus-bagliano / commits / d8b7db0abf
Fork 0

Export rerere() and launch_editor().

Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kristian Høgsberg committed Sep 17, 2007 at 20:06 UTC d8b7db0abfd0c74478964f5a9b08ad141f4f7f82
2 files changed +27 -5
builtin-rerere.c
+26 -5
@@ -389,18 +389,39 @@ static int is_rerere_enabled(void)
389 return 1;
390 }
391
392 -int cmd_rerere(int argc, const char **argv, const char *prefix)
392 +static int setup_rerere(struct path_list *merge_rr)
393 {
394 - struct path_list merge_rr = { NULL, 0, 0, 1 };
395 - int i, fd = -1;
394 + int fd;
395
396 git_config(git_rerere_config);
397 if (!is_rerere_enabled())
399 - return 0;
398 + return -1;
399
400 merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR"));
401 fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
403 - read_rr(&merge_rr);
402 + read_rr(merge_rr);
403 + return fd;
404 +}
405 +
406 +int rerere(void)
407 +{
408 + struct path_list merge_rr = { NULL, 0, 0, 1 };
409 + int fd;
410 +
411 + fd = setup_rerere(&merge_rr);
412 + if (fd < 0)
413 + return 0;
414 + return do_plain_rerere(&merge_rr, fd);
415 +}
416 +
417 +int cmd_rerere(int argc, const char **argv, const char *prefix)
418 +{
419 + struct path_list merge_rr = { NULL, 0, 0, 1 };
420 + int i, fd;
421 +
422 + fd = setup_rerere(&merge_rr);
423 + if (fd < 0)
424 + return 0;
425
426 if (argc < 2)
427 return do_plain_rerere(&merge_rr, fd);
commit.h
+1
@@ -131,5 +131,6 @@ int in_merge_bases(struct commit *, struct commit **, int);
131
132 extern int interactive_add(void);
133 extern void add_files_to_cache(int verbose, const char *prefix, const char **files);
134 +extern int rerere(void);
135
136 #endif /* COMMIT_H */