diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-25 11:18:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-25 11:18:32 -0800 |
commit | d0038f4b31d6ab1f0602a4d3c19e35c5004175fa (patch) | |
tree | 2b67cde99b211b34335e838515690896794c6d75 /config.c | |
parent | The sixth batch for 2.26 (diff) | |
parent | remote rename/remove: gently handle remote.pushDefault config (diff) | |
download | tgif-d0038f4b31d6ab1f0602a4d3c19e35c5004175fa.tar.xz |
Merge branch 'bw/remote-rename-update-config'
"git remote rename X Y" needs to adjust configuration variables
(e.g. branch.<name>.remote) whose value used to be X to Y.
branch.<name>.pushRemote is now also updated.
* bw/remote-rename-update-config:
remote rename/remove: gently handle remote.pushDefault config
config: provide access to the current line number
remote rename/remove: handle branch.<name>.pushRemote config values
remote: clean-up config callback
remote: clean-up by returning early to avoid one indentation
pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
Diffstat (limited to 'config.c')
-rw-r--r-- | config.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3338,6 +3338,14 @@ enum config_scope current_config_scope(void) return current_parsing_scope; } +int current_config_line(void) +{ + if (current_config_kvi) + return current_config_kvi->linenr; + else + return cf->linenr; +} + int lookup_config(const char **mapping, int nr_mapping, const char *var) { int i; |