]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/expand-runtime-prefix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2021 22:32:38 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2021 22:32:38 +0000 (15:32 -0700)
Pathname expansion (like "~username/") learned a way to specify a
location relative to Git installation (e.g. its $sharedir which is
$(prefix)/share), with "%(prefix)".

* js/expand-runtime-prefix:
  expand_user_path: allow in-flight topics to keep using the old name
  interpolate_path(): allow specifying paths relative to the runtime prefix
  Use a better name for the function interpolating paths
  expand_user_path(): clarify the role of the `real_home` parameter
  expand_user_path(): remove stale part of the comment
  tests: exercise the RUNTIME_PREFIX feature

1  2 
Makefile
cache.h
config.c
sequencer.c

diff --cc Makefile
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc sequencer.c
Simple merge