From 1dcea0f02d8322f7af6bc8a31e9d0b3b0a1353d0 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Fri, 16 Apr 2021 08:10:49 -0700
Subject: [PATCH] Fixed sort ordering and updated test to output context
 information.

---
 BUILD                           | 2 +-
 build_files_updated_unittest.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILD b/BUILD
index 68750685ea..1788cfc06e 100644
--- a/BUILD
+++ b/BUILD
@@ -368,8 +368,8 @@ cc_library(
         "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
         "src/google/protobuf/compiler/cpp/cpp_message.cc",
         "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc",
         "src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc",
+        "src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc",
         "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
         "src/google/protobuf/compiler/cpp/cpp_service.cc",
         "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
diff --git a/build_files_updated_unittest.sh b/build_files_updated_unittest.sh
index c86307193c..87541c35fa 100755
--- a/build_files_updated_unittest.sh
+++ b/build_files_updated_unittest.sh
@@ -58,5 +58,5 @@ bash "${test_dir}/update_file_lists.sh"
 
 # Test whether there are any differences
 for file in ${generated_files[@]}; do
-  diff "${golden_dir}/${file}" "${test_dir}/${file}"
+  diff -du "${golden_dir}/${file}" "${test_dir}/${file}"
 done