mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 05:36:10 +02:00
Code

Export rerere() and launch_editor(). 

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kristian Høgsberg 2007-09-17 20:06:47 -04:00 committed by Junio C Hamano
parent 5868016508
commit d8b7db0abf
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builtin-rerere.c
View File

@ -389,18 +389,39 @@ static int is_rerere_enabled(void)
return 1;
}
int cmd_rerere(int argc, const char **argv, const char *prefix)
static int setup_rerere(struct path_list *merge_rr)
{
struct path_list merge_rr = { NULL, 0, 0, 1 };
int i, fd = -1;
int fd;
git_config(git_rerere_config);
if (!is_rerere_enabled())
return 0;
return -1;
merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR"));
fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
read_rr(&merge_rr);
read_rr(merge_rr);
return fd;
}
int rerere(void)
{
struct path_list merge_rr = { NULL, 0, 0, 1 };
int fd;
fd = setup_rerere(&merge_rr);
if (fd < 0)
return 0;
return do_plain_rerere(&merge_rr, fd);
}
int cmd_rerere(int argc, const char **argv, const char *prefix)
{
struct path_list merge_rr = { NULL, 0, 0, 1 };
int i, fd;
fd = setup_rerere(&merge_rr);
if (fd < 0)
return 0;
if (argc < 2)
return do_plain_rerere(&merge_rr, fd);

1
commit.h
View File

@ -131,5 +131,6 @@ int in_merge_bases(struct commit *, struct commit **, int);
extern int interactive_add(void);
extern void add_files_to_cache(int verbose, const char *prefix, const char **files);
extern int rerere(void);
#endif /* COMMIT_H */