prepare-ChangeLog fails to find deleted functions in files with spaces in their path in Git repositories

aroben · webkit-commit-queue · commit fe736f9ae775 · 2021-04-08T18:30:02.000Z
https://bugs.webkit.org/show_bug.cgi?id=224303 Patch by Adam Roben <aroben@apple.com> on 2021-04-08 Reviewed by Sam Weinig. It would also print a bunch of errors like this on stderr: fatal: ambiguous argument 'Foo/Bar.cpp': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' * Scripts/prepare-ChangeLog: (originalFile): Quote the file path in the `git show` command we construct. Canonical link: https://commits.webkit.org/236302@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2021-04-08  Adam Roben  <aroben@apple.com>
+
+        prepare-ChangeLog fails to find deleted functions in files with spaces in their path in Git repositories
+        https://bugs.webkit.org/show_bug.cgi?id=224303
+
+        Reviewed by Sam Weinig.
+
+        It would also print a bunch of errors like this on stderr:
+
+            fatal: ambiguous argument 'Foo/Bar.cpp': unknown revision or path not in the working tree.
+            Use '--' to separate paths from revisions, like this:
+            'git <command> [<revision>...] -- [<file>...]'
+
+        * Scripts/prepare-ChangeLog:
+        (originalFile): Quote the file path in the `git show` command we
+        construct.
+
 2021-04-08  Truitt Savell  <tsavell@apple.com>
 
         Repalce bot187 with bot178 for CLoop tester. 
diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog
@@ -270,7 +270,7 @@ sub originalFile($$$$)
         } else {
             $command .= "HEAD";
         }
-        $command .= ":$file";
+        $command .= ":'$file'";
     }
 
     return $command;

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ sub originalFile($$$$)`
`270`	`270`	`} else {`
`271`	`271`	`$command .= "HEAD";`
`272`	`272`	`}`
`273`		`- $command .= ":$file";`
	`273`	`+ $command .= ":'$file'";`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`return $command;`