summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-25 19:18:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-25 19:18:32 (GMT)
commitd0038f4b31d6ab1f0602a4d3c19e35c5004175fa (patch)
tree2b67cde99b211b34335e838515690896794c6d75 /t/helper
parent51ebf55b9309824346a6589c9f3b130c6f371b8f (diff)
parentb3fd6cbf29435f8b49a0a5d9f86236e00b084624 (diff)
downloadgit-d0038f4b31d6ab1f0602a4d3c19e35c5004175fa.zip
git-d0038f4b31d6ab1f0602a4d3c19e35c5004175fa.tar.gz
git-d0038f4b31d6ab1f0602a4d3c19e35c5004175fa.tar.bz2
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 't/helper')
-rw-r--r--t/helper/test-config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 1e3bc7c..234c722 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -48,6 +48,7 @@ static int iterate_cb(const char *var, const char *value, void *data)
printf("value=%s\n", value ? value : "(null)");
printf("origin=%s\n", current_config_origin_type());
printf("name=%s\n", current_config_name());
+ printf("lno=%d\n", current_config_line());
printf("scope=%s\n", config_scope_name(current_config_scope()));
return 0;