[clang-format] Fix a bug in git-clang-format --binary

[owenca]

This is a rework of #74176, which erroneously changed the default clang-format filename (clang-format, clang-format.exe, etc.) to an absolute pathname. Instead, we should do that only if the name is a pathname, e.g. ./clang-format, llvm-project/build/bin/clang-format.exe, etc. See also #74176 (comment).

[llvmbot]

@llvm/pr-subscribers-clang-format

Author: Owen Pan (owenca)

Changes

This is a rework of #74176.

---

Full diff: https://github.com/llvm/llvm-project/pull/74293.diff

1 Files Affected:

• (modified) clang/tools/clang-format/git-clang-format (+3-2)

diff --git a/clang/tools/clang-format/git-clang-format b/clang/tools/clang-format/git-clang-format
index 6e827e17b4ee2..1a4d7670bcf79 100755
--- a/clang/tools/clang-format/git-clang-format
+++ b/clang/tools/clang-format/git-clang-format
@@ -105,7 +105,7 @@ def main():
     usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
     description=desc)
   p.add_argument('--binary',
-                 default=config.get('clangformat.binary', 'clang-format'),
+                 type=os.path.abspath,
                  help='path to clang-format'),
   p.add_argument('--commit',
                  default=config.get('clangformat.commit', 'HEAD'),
@@ -153,7 +153,8 @@ def main():
   else:
     if len(commits) > 2:
       die('at most two commits allowed; %d given' % len(commits))
-  opts.binary=os.path.abspath(opts.binary)
+  if opts.binary is None:
+    opts.binary = config.get('clangformat.binary', 'clang-format')
   changed_lines = compute_diff_and_extract_lines(commits, files, opts.staged)
   if opts.verbose >= 1:
     ignored_files = set(changed_lines)

[jayfoad]

LGTM but the commit message should really explain what problem this fixes instead of just saying "rework".