Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: > Again, I did a test merge to master@cb96e1697a, next@a128411c76 > and seen@df1b4f9cf9. The conflict which showed up in v1 against > the 'seen' branch now appears in the 'master' branch and has the > same resolution as v1. Thanks. > A range-diff against v3 is given below. > > [+] https://lore.kernel.org/git/aCrekcz6onTFgEWw@xxxxxx/ > > Changes in v3: > > Patch #3 changed as a result of Patrick's review [*]: > > - use the '/' magic string operator when setting the > ETC_GIT{CONFIG,ATTRIBUTES} build options. > - add the default values to the 'description' fields > for the 'gitconfig' and 'gitattributes' option > definitions > > Also, Junio, the range-diff below shows the typo fixup, but > you should find that it doesn't show for you this time. ;) OK. And changes in v4 are just that two redundant comments in the option definitions are removed, which makes sense looking at the discussion from the sidelines. Will queue. Are we done with this series by now? > range-diff against v3: > > 1: ac97fdc76e = 1: 247bc82c01 meson.build: quote the GITWEBDIR build configuration > 2: 181738d371 = 2: a87f683a95 meson: correct install location of YAML.pm > 3: 1f4c74973c ! 3: 40ea59efca meson: correct path to system config/attribute files > @@ meson_options.txt: option('default_pager', type: 'string', value: 'less', > - description: 'Path to the global git configuration file.') > -option('gitattributes', type: 'string', value: '/etc/gitattributes', > - description: 'Path to the global git attributes file.') > -+option('gitconfig', type: 'string', # default 'etc/gitconfig' > ++option('gitconfig', type: 'string', > + description: 'Path to the global git configuration file. (default: etc/gitconfig)') > -+option('gitattributes', type: 'string', # default 'etc/gitattributes' > ++option('gitattributes', type: 'string', > + description: 'Path to the global git attributes file. (default: etc/gitattributes)') > option('pager_environment', type: 'string', value: 'LESS=FRX LV=-c', > description: 'Environment used when spawning the pager') > 4: 97ff1613f5 = 4: a7d2f1e132 meson.build: correct setting of GIT_EXEC_PATH > 5: 983488fe4e = 5: a45b9dc650 configure.ac: upgrade to a compilation check for sysinfo
