Follow-up to r1921602: Fix argument sequence of svn_client__get_diff_…

…writer_svn to much its declaration with its implementation. When the use_git_diff_format argument was introduced to the function, it was added incorrectly to its declaration. This commit adjust the declaration to the implementation. The sequence of args used in the implementation is more correct, because it repeats the svn_client_diff7 family. * subversion/include/private/svn_client_private.h (svn_client__get_diff_writer_svn): Swap use_git_diff_format and pretty_print_mergeinfo args. * subversion/svn/shelf-cmd.c (shelf_diff): Update the usage to fit with the updated function. * subversion/svn/shelf2-cmd.c (shelf_diff): Ditto. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1922647 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 23, 2024 · 464ae32 · 464ae32
1 parent 65f5ba8
commit 464ae32
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/subversion/include/private/svn_client_private.h b/subversion/include/private/svn_client_private.h
@@ -375,8 +375,8 @@ svn_client__get_diff_writer_svn(
                 svn_boolean_t ignore_content_type,
                 svn_boolean_t ignore_properties,
                 svn_boolean_t properties_only,
-                svn_boolean_t pretty_print_mergeinfo,
                 svn_boolean_t use_git_diff_format,
+                svn_boolean_t pretty_print_mergeinfo,
                 const char *header_encoding,
                 svn_stream_t *outstream,
                 svn_stream_t *errstream,

diff --git a/subversion/svn/shelf-cmd.c b/subversion/svn/shelf-cmd.c
@@ -769,8 +769,8 @@ shelf_diff(const char *name,
                 FALSE /*ignore_content_type*/,
                 FALSE /*ignore_properties*/,
                 FALSE /*properties_only*/,
-                TRUE /*pretty_print_mergeinfo*/,
                 FALSE /*use_git_diff_format*/,
+                TRUE /*pretty_print_mergeinfo*/,
                 svn_cmdline_output_encoding(scratch_pool),
                 stream, errstream,
                 ctx, scratch_pool));

diff --git a/subversion/svn/shelf2-cmd.c b/subversion/svn/shelf2-cmd.c
@@ -769,8 +769,8 @@ shelf_diff(const char *name,
                 FALSE /*ignore_content_type*/,
                 FALSE /*ignore_properties*/,
                 FALSE /*properties_only*/,
-                TRUE /*pretty_print_mergeinfo*/,
                 FALSE /*use_git_diff_format*/,
+                TRUE /*pretty_print_mergeinfo*/,
                 svn_cmdline_output_encoding(scratch_pool),
                 stream, errstream,
                 ctx, scratch_pool));