@matheusbsbs / matheus-bagliano / commits / 90a78b83e0

diff: run arguments through precompose_argv

When running diff commands, a pathspec containing decomposed unicode code points is not converted to precomposed unicode form under Mac OS X, but we normalize the paths in the index and the history to precomposed form on that platform. As a result, the pathspec would not match and no diff is shown. Unlike many builtin commands, the "diff" family of commands do not use parse_options(), which is how other builtin commands indirectly call precompose_argv() to normalize argv[] into precomposed form on Mac OSX. Teach these commands to call precompose_argv() themselves. Note that precomopose_argv() normalizes not just paths but all command line arguments, so things like "git diff -G $string" when $string has the decomposed form would first be normalized into the precomposed form and would stop hitting the same string in the decomposed form in the diff output with this change. It is not a problem per-se, as "log" family of commands already use parse_options() and call precompose_argv()--we can think of this change as making the "diff" family of commands behave in a similar way as the commands in the "log" family. Signed-off-by: Alexander Rinass <alex@fournova.com> Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Alexander Rinass committed May 13, 2016 at 22:41 UTC 90a78b83e0b812d1f42501a54372720def4ddd84

5 files changed +47

builtin/diff-files.c

@@ -24,6 +24,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)

24 gitmodules_config();

25 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

26 rev.abbrev = 0;

27 + precompose_argv(argc, argv);

29 argc = setup_revisions(argc, argv, &rev, NULL);

30 while (1 < argc && argv[1][0] == '-') {

builtin/diff-index.c

@@ -21,6 +21,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)

21 gitmodules_config();

22 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

23 rev.abbrev = 0;

24 + precompose_argv(argc, argv);

26 argc = setup_revisions(argc, argv, &rev, NULL);

27 for (i = 1; i < argc; i++) {

builtin/diff-tree.c

@@ -114,6 +114,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)

114 opt->disable_stdin = 1;

115 memset(&s_r_opt, 0, sizeof(s_r_opt));

116 s_r_opt.tweak = diff_tree_tweak_rev;

117 +

118 + precompose_argv(argc, argv);

119 argc = setup_revisions(argc, argv, opt, &s_r_opt);

120

121 while (--argc > 0) {

builtin/diff.c

@@ -319,6 +319,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)

319 if (!no_index)

320 gitmodules_config();

321 git_config(git_diff_ui_config, NULL);

322 + precompose_argv(argc, argv);

323

324 init_revisions(&rev, prefix);

325

t/t3910-mac-os-precompose.sh

+42

@@ -49,12 +49,54 @@ test_expect_success "setup" '

49 test_expect_success "setup case mac" '

50 git checkout -b mac_os

51 '

52 +# This will test nfd2nfc in git diff

53 +test_expect_success "git diff f.Adiar" '

54 + touch f.$Adiarnfc &&

55 + git add f.$Adiarnfc &&

56 + echo f.Adiarnfc >f.$Adiarnfc &&

57 + git diff f.$Adiarnfd >expect &&

58 + git diff f.$Adiarnfc >actual &&

59 + test_cmp expect actual &&

60 + git reset HEAD f.Adiarnfc &&

61 + rm f.$Adiarnfc expect actual

62 +'

63 +# This will test nfd2nfc in git diff-files

64 +test_expect_success "git diff-files f.Adiar" '

65 + touch f.$Adiarnfc &&

66 + git add f.$Adiarnfc &&

67 + echo f.Adiarnfc >f.$Adiarnfc &&

68 + git diff-files f.$Adiarnfd >expect &&

69 + git diff-files f.$Adiarnfc >actual &&

70 + test_cmp expect actual &&

71 + git reset HEAD f.Adiarnfc &&

72 + rm f.$Adiarnfc expect actual

73 +'

74 +# This will test nfd2nfc in git diff-index

75 +test_expect_success "git diff-index f.Adiar" '

76 + touch f.$Adiarnfc &&

77 + git add f.$Adiarnfc &&

78 + echo f.Adiarnfc >f.$Adiarnfc &&

79 + git diff-index HEAD f.$Adiarnfd >expect &&

80 + git diff-index HEAD f.$Adiarnfc >actual &&

81 + test_cmp expect actual &&

82 + git reset HEAD f.Adiarnfc &&

83 + rm f.$Adiarnfc expect actual

84 +'

85 # This will test nfd2nfc in readdir()

86 test_expect_success "add file Adiarnfc" '

87 echo f.Adiarnfc >f.$Adiarnfc &&

88 git add f.$Adiarnfc &&

89 git commit -m "add f.$Adiarnfc"

90 '

91 +# This will test nfd2nfc in git diff-tree

92 +test_expect_success "git diff-tree f.Adiar" '

93 + echo f.Adiarnfc >>f.$Adiarnfc &&

94 + git diff-tree HEAD f.$Adiarnfd >expect &&

95 + git diff-tree HEAD f.$Adiarnfc >actual &&

96 + test_cmp expect actual &&

97 + git checkout f.$Adiarnfc &&

98 + rm expect actual

99 +'

100 # This will test nfd2nfc in git stage()

101 test_expect_success "stage file d.Adiarnfd/f.Adiarnfd" '

102 mkdir d.$Adiarnfd &&