254703 2023-03-29 16:23:56 -0700 pre-commit hook should not add unstaged changes from pbxproj files to index 2023-05-05 10:42:31 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=239975 InRadar P2 Normal --- 239975 1 emw webkit-unassigned ap jbedard webkit-bug-importer oldest_to_newest 1945168 0 emw 2023-03-29 16:23:56 -0700 Currently, if changes to an Xcode project are staged, the entire pbxproj is sorted and git-added to the index. This makes it difficult to commit some parts of a pbxproj while leaving other changes unstaged. 1946887 1 webkit-bug-importer 2023-04-05 16:24:17 -0700 <rdar://problem/107684149> 1952386 2 jbedard 2023-05-02 08:37:22 -0700 This was something SVN did, we did this for pure-git checkouts in https://bugs.webkit.org/show_bug.cgi?id=239975. Looks like it's the very bottom of Tools/Scripts/hooks/pre-commit that is the offending bit of code. Not quite sure how to address this while retaining the sorting behavior, because it seems like Elliott's ask here makes the sorting behavior impossible... 1953205 3 emw 2023-05-05 10:42:31 -0700 > Not quite sure how to address this while retaining the sorting behavior, because it seems like Elliott's ask here makes the sorting behavior impossible… I think what it needs to do is read the index copy (`git show :foo.xcodeproj/project.pbxproj`), sort *that*, and git-add it.