On 02/21, Junio C Hamano wrote: > * bw/c-plus-plus (2018-02-14) 38 commits > - fixup! diff: rename 'this' variables > - replace: rename 'new' variables > - trailer: rename 'template' variables > - tempfile: rename 'template' variables > - wrapper: rename 'template' variables > - environment: rename 'namespace' variables > - diff: rename 'template' variables > - environment: rename 'template' variables > - init-db: rename 'template' variables > - unpack-trees: rename 'new' variables > - trailer: rename 'new' variables > - submodule: rename 'new' variables > - split-index: rename 'new' variables > - remote: rename 'new' variables > - ref-filter: rename 'new' variables > - read-cache: rename 'new' variables > - line-log: rename 'new' variables > - imap-send: rename 'new' variables > - http: rename 'new' variables > - entry: rename 'new' variables > - diffcore-delta: rename 'new' variables > - diff: rename 'new' variables > - diff-lib: rename 'new' variable > - commit: rename 'new' variables > - combine-diff: rename 'new' variables > - remote: rename 'new' variables > - reflog: rename 'new' variables > - pack-redundant: rename 'new' variables > - help: rename 'new' variables > - checkout: rename 'new' variables > - apply: rename 'new' variables > - apply: rename 'try' variables > - diff: rename 'this' variables > - rev-parse: rename 'this' variable > - pack-objects: rename 'this' variables > - blame: rename 'this' variables > - object: rename function 'typename' to 'type_name' > - object_info: change member name from 'typename' to 'type_name' > > Avoid using identifiers that clash with C++ keywords. Even though > it is not a goal to compile Git with C++ compilers, changes like > this help use of code analysis tools that targets C++ on our > codebase. > > Is the 'fixup!' cleanly squashable to the problematic one, or does > this series require another reroll to get it in a good enough shape? Yeah the fixup patch looks good to me. I don't think there was anything else that needed attention so it should be in good shape with the fixup patch. -- Brandon Williams
