| Message ID | 20230801080920.658638-2-chenghaoyang@google.com |
|---|---|
| State | Accepted |
| Commit | 960d0c1e19feaf310321c906e14bd5410c6be629 |
| Headers | show |
| Series |
|
| Related | show |
Hi Harvey, Quoting Harvey Yang via libcamera-devel (2023-08-01 09:07:04) > `SortIncludes: true` was added in both ae05b9f and 0e1ff86, which caused > issues to run clang-format. > Yikes - this looks like it was my fault! Sorry! But thanks for the cleanup / fix... Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> > --- > .clang-format | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/.clang-format b/.clang-format > index 5b8857da..cac7029f 100644 > --- a/.clang-format > +++ b/.clang-format > @@ -66,7 +66,6 @@ ExperimentalAutoDetectBinPacking: false > FixNamespaceComments: true > ForEachMacros: > - 'udev_list_entry_foreach' > -SortIncludes: true > IncludeBlocks: Regroup > IncludeCategories: > # Headers matching the name of the component are matched automatically. > -- > 2.41.0.585.gd2178a4bd4-goog >
On Tue, Aug 01, 2023 at 09:21:02AM +0100, Kieran Bingham via libcamera-devel wrote: > Hi Harvey, > > Quoting Harvey Yang via libcamera-devel (2023-08-01 09:07:04) > > `SortIncludes: true` was added in both ae05b9f and 0e1ff86, which caused > > issues to run clang-format. > > > > Yikes - this looks like it was my fault! Sorry! > > But thanks for the cleanup / fix... > > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> > > --- > > .clang-format | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/.clang-format b/.clang-format > > index 5b8857da..cac7029f 100644 > > --- a/.clang-format > > +++ b/.clang-format > > @@ -66,7 +66,6 @@ ExperimentalAutoDetectBinPacking: false > > FixNamespaceComments: true > > ForEachMacros: > > - 'udev_list_entry_foreach' > > -SortIncludes: true > > IncludeBlocks: Regroup > > IncludeCategories: > > # Headers matching the name of the component are matched automatically.
Hi Kieran Glad to help clean up :) On Tue, Aug 1, 2023 at 4:21 PM Kieran Bingham < kieran.bingham@ideasonboard.com> wrote: > Hi Harvey, > > Quoting Harvey Yang via libcamera-devel (2023-08-01 09:07:04) > > `SortIncludes: true` was added in both ae05b9f and 0e1ff86, which caused > > issues to run clang-format. > > > > Yikes - this looks like it was my fault! Sorry! > > But thanks for the cleanup / fix... > > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > > Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> > > --- > > .clang-format | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/.clang-format b/.clang-format > > index 5b8857da..cac7029f 100644 > > --- a/.clang-format > > +++ b/.clang-format > > @@ -66,7 +66,6 @@ ExperimentalAutoDetectBinPacking: false > > FixNamespaceComments: true > > ForEachMacros: > > - 'udev_list_entry_foreach' > > -SortIncludes: true > > IncludeBlocks: Regroup > > IncludeCategories: > > # Headers matching the name of the component are matched > automatically. > > -- > > 2.41.0.585.gd2178a4bd4-goog > > >
On Tue, Aug 01, 2023 at 11:41:15AM +0300, Laurent Pinchart via libcamera-devel wrote: > On Tue, Aug 01, 2023 at 09:21:02AM +0100, Kieran Bingham via libcamera-devel wrote: > > Quoting Harvey Yang via libcamera-devel (2023-08-01 09:07:04) > > > `SortIncludes: true` was added in both ae05b9f and 0e1ff86, which caused > > > issues to run clang-format. > > > > > > > Yikes - this looks like it was my fault! Sorry! > > > > But thanks for the cleanup / fix... > > > > > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I'll update the commit message to ---- libcamera: Remove duplicated SortIncludes in `.clang-format` `SortIncludes: true` was added in both commit ae05b9f9d082 ("clang-format: Enable sorted includes") and commit 0e1ff86e78ae ("clang-format: Regroup sort orders"), which caused issues to run clang-format. Fixes: 0e1ff86e78ae ("clang-format: Regroup sort orders") ---- (plus the SoB and Rb tags) and push. > > > Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> > > > --- > > > .clang-format | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/.clang-format b/.clang-format > > > index 5b8857da..cac7029f 100644 > > > --- a/.clang-format > > > +++ b/.clang-format > > > @@ -66,7 +66,6 @@ ExperimentalAutoDetectBinPacking: false > > > FixNamespaceComments: true > > > ForEachMacros: > > > - 'udev_list_entry_foreach' > > > -SortIncludes: true > > > IncludeBlocks: Regroup > > > IncludeCategories: > > > # Headers matching the name of the component are matched automatically.
diff --git a/.clang-format b/.clang-format index 5b8857da..cac7029f 100644 --- a/.clang-format +++ b/.clang-format @@ -66,7 +66,6 @@ ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true ForEachMacros: - 'udev_list_entry_foreach' -SortIncludes: true IncludeBlocks: Regroup IncludeCategories: # Headers matching the name of the component are matched automatically.
`SortIncludes: true` was added in both ae05b9f and 0e1ff86, which caused issues to run clang-format. Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> --- .clang-format | 1 - 1 file changed, 1 deletion(-)