mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: do not rely on the_repository for interactive edits

Browse Source 
We implicitly rely on `the_repository` when editing a file interactively
because we call `git_path()`. Adapt the function to instead take a
`struct repository` as a parameter so that we can remove this hidden
dependency.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-13 11:13:25 +02:00
committed by Junio C Hamano
parent 61419a42f6
commit 419dbb29d8
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
add-patch.c
View File

@ -1140,7 +1140,8 @@ static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
"removed, then the edit is\n" "removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n")); "aborted and the hunk is left unchanged.\n"));
if (strbuf_edit_interactively(&s->buf, "addp-hunk-edit.diff", NULL) < 0) if (strbuf_edit_interactively(the_repository, &s->buf,
"addp-hunk-edit.diff", NULL) < 0)
return -1; return -1;
/* strip out commented lines */ /* strip out commented lines */

13
editor.c
View File

@ -133,14 +133,17 @@ int launch_sequence_editor(const char *path, struct strbuf *buffer,
return launch_specified_editor(git_sequence_editor(), path, buffer, env); return launch_specified_editor(git_sequence_editor(), path, buffer, env);
} }
int strbuf_edit_interactively(struct strbuf *buffer, const char *path, int strbuf_edit_interactively(struct repository *r,
struct strbuf *buffer, const char *path,
const char *const *env) const char *const *env)
{ {
char *path2 = NULL; struct strbuf sb = STRBUF_INIT;
int fd, res = 0; int fd, res = 0;
if (!is_absolute_path(path)) if (!is_absolute_path(path)) {
path = path2 = xstrdup(git_path("%s", path)); strbuf_repo_git_path(&sb, r, "%s", path);
path = sb.buf;
}
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666); fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd < 0) if (fd < 0)
@ -157,6 +160,6 @@ int strbuf_edit_interactively(struct strbuf *buffer, const char *path,
unlink(path); unlink(path);
} }
free(path2); strbuf_release(&sb);
return res; return res;
} }

5
editor.h
View File

@ -1,6 +1,7 @@
#ifndef EDITOR_H #ifndef EDITOR_H
#define EDITOR_H #define EDITOR_H
struct repository;
struct strbuf; struct strbuf;
const char *git_editor(void); const char *git_editor(void);
@ -28,7 +29,7 @@ int launch_sequence_editor(const char *path, struct strbuf *buffer,
* *
* If `path` is relative, it refers to a file in the `.git` directory. * If `path` is relative, it refers to a file in the `.git` directory.
*/ */
int strbuf_edit_interactively(struct strbuf *buffer, const char *path, int strbuf_edit_interactively(struct repository *r, struct strbuf *buffer,
const char *const *env); const char *path, const char *const *env);
#endif #endif