diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-05 10:49:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-05 10:49:49 -0700 |
| commit | 3256584c36f649abb2af58e7b190d3cf674ba56e (patch) | |
| tree | 032547196dd3036dbbbe315621782dcf804d486e /worktree.c | |
| parent | 7774cfed6261ce2900c84e55906da708c711d601 (diff) | |
| parent | 31399a6b6166cf76cc533bc9915878211607ed80 (diff) | |
| download | git-3256584c36f649abb2af58e7b190d3cf674ba56e.tar.gz | |
Merge branch 'rs/config-comment'
"git config" learned "--comment=<message>" option to leave a
comment immediately after the "variable = value" on the same line
in the configuration file.
* rs/config-comment:
config: allow tweaking whitespace between value and comment
config: fix --comment formatting
config: add --comment option to add a comment
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/worktree.c b/worktree.c index b02a05a74a..cf5eea8c93 100644 --- a/worktree.c +++ b/worktree.c @@ -807,9 +807,9 @@ int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath, static int move_config_setting(const char *key, const char *value, const char *from_file, const char *to_file) { - if (git_config_set_in_file_gently(to_file, key, value)) + if (git_config_set_in_file_gently(to_file, key, NULL, value)) return error(_("unable to set %s in '%s'"), key, to_file); - if (git_config_set_in_file_gently(from_file, key, NULL)) + if (git_config_set_in_file_gently(from_file, key, NULL, NULL)) return error(_("unable to unset %s in '%s'"), key, from_file); return 0; } |