diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 15:30:38 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-19 17:32:10 +0900 |
| commit | c44c24621da1cf45e2525b42d90982c78bffc207 (patch) | |
| tree | d9f984d3a425399b0caedce84aae154e3b0567e9 /builtin | |
| parent | rebase -i: combine rebase--interactive.c with rebase.c (diff) | |
| download | tgif-c44c24621da1cf45e2525b42d90982c78bffc207.tar.xz | |
rebase -i: remove duplication
path_state_dir() and merge_dir() refer to the same path so remove one of
them.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 57a3c9caf1..610b67827b 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -37,7 +37,6 @@ static char const * const builtin_rebase_usage[] = { NULL }; -static GIT_PATH_FUNC(path_state_dir, "rebase-merge/") static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto") static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive") static GIT_PATH_FUNC(apply_dir, "rebase-apply") @@ -182,8 +181,8 @@ static int init_basic_state(struct replay_opts *opts, const char *head_name, { FILE *interactive; - if (!is_directory(path_state_dir()) && mkdir_in_gitdir(path_state_dir())) - return error_errno(_("could not create temporary %s"), path_state_dir()); + if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir())) + return error_errno(_("could not create temporary %s"), merge_dir()); delete_reflog("REBASE_HEAD"); |