Skip to content

remote rename/remove: improve handling of configuration values

Bert Wesarg git 3 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest0 of 7 patches 0 repliesNew
  2. v26 of 7 patches 3 repliesSuperseded
  3. v16 of 7 patches 10 repliesSuperseded

Changes since v3 from the cover letter

* rebasd onto mr/show-config-scope (feaf5eea41)

Patches in v3 No applies recorded yet

None of the 7 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/7] remote rename/remove: improve handling of configuration values

While fixing that 'git remote rename X Y' does not rename the values for 'branch.*.pushRemote', it opened the possibility to more improvements in this area:

- 'remote rename' did not accept single-letter abbreviations for 'branch.*.rebase' like 'pull --rebase' does

- minor clean-ups the config callback

- patch 5 will be replaced by/rebased on Matthew's work in 'config: allow user to know scope of config options', once 'config_scope_name' is available

- gently handling the rename of 'remote.pushDefault'

Changes since v3:
* rebasd onto mr/show-config-scope (feaf5eea41)

Changes since v1:
* avoid mixed declarations and statements
* 'git remote remove' learned similar treatment

Bert Wesarg (6):
pull --rebase/remote rename: document and honor single-letter
abbreviations rebase types
remote: clean-up by returning early to avoid one indentation
remote: clean-up config callback
remote rename/remove: handle branch.<name>.pushRemote config values
config: provide access to the current line number
remote rename/remove: gently handle remote.pushDefault config

 Documentation/config/branch.txt |   7 +-
 Documentation/config/pull.txt   |   7 +-
 Makefile                        |   1 +
 builtin/pull.c                  |  29 +----
 builtin/remote.c                | 188 ++++++++++++++++++++++----------
 config.c                        |   8 ++
 config.h                        |   1 +
 rebase.c                        |  35 ++++++
 rebase.h                        |  15 +++
 t/helper/test-config.c          |   1 +
 t/t1308-config-set.sh           |  14 ++-
 t/t5505-remote.sh               |  88 ++++++++++++++-
 12 files changed, 304 insertions(+), 90 deletions(-)
 create mode 100644 rebase.c
 create mode 100644 rebase.h
Signature · 1 line
2.24.1.497.g9abd7b20b4.dirty