user-manual: update for new default --track behavior

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 21e61af265570f2795a45a7c87cff49094f45b1d..a5fc56bdad5d96b2a4e0e1140206b8367a257867 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1162,6 +1162,7 @@ static void setup_diff_attr_check(struct git_attr_check *check)
 static void diff_filespec_check_attr(struct diff_filespec *one)
 {
        struct git_attr_check attr_diff_check;
+       int check_from_data = 0;
 
        if (one->checked_attr)
                return;
@@ -1179,6 +1180,8 @@ static void diff_filespec_check_attr(struct diff_filespec *one)
                        ;
                else if (ATTR_FALSE(value))
                        one->is_binary = 1;
+               else
+                       check_from_data = 1;
 
                /* funcname pattern ident */
                if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
@@ -1187,12 +1190,13 @@ static void diff_filespec_check_attr(struct diff_filespec *one)
                        one->funcname_pattern_ident = value;
        }
 
-       if (!one->data && DIFF_FILE_VALID(one))
-               diff_populate_filespec(one, 0);
-
-       if (one->data)
-               one->is_binary = buffer_is_binary(one->data, one->size);
+       if (check_from_data) {
+               if (!one->data && DIFF_FILE_VALID(one))
+                       diff_populate_filespec(one, 0);
 
+               if (one->data)
+                       one->is_binary = buffer_is_binary(one->data, one->size);
+       }
 }
 
 int diff_filespec_is_binary(struct diff_filespec *one)
@@ -1212,9 +1216,22 @@ static const char *funcname_pattern(const char *ident)
        return NULL;
 }
 
+static struct builtin_funcname_pattern {
+       const char *name;
+       const char *pattern;
+} builtin_funcname_pattern[] = {
+       { "java", "!^[  ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
+                       "new\\|return\\|switch\\|throw\\|while\\)\n"
+                       "^[     ]*\\(\\([       ]*"
+                       "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
+                       "[      ]*([^;]*$\\)" },
+       { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
+};
+
 static const char *diff_funcname_pattern(struct diff_filespec *one)
 {
        const char *ident, *pattern;
+       int i;
 
        diff_filespec_check_attr(one);
        ident = one->funcname_pattern_ident;
@@ -1236,12 +1253,9 @@ static const char *diff_funcname_pattern(struct diff_filespec *one)
         * And define built-in fallback patterns here.  Note that
         * these can be overriden by the user's config settings.
         */
-       if (!strcmp(ident, "java"))
-               return "!^[     ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
-                       "new\\|return\\|switch\\|throw\\|while\\)\n"
-                       "^[     ]*\\(\\([       ]*"
-                       "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
-                       "[      ]*([^;]*$\\)";
+       for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
+               if (!strcmp(ident, builtin_funcname_pattern[i].name))
+                       return builtin_funcname_pattern[i].pattern;
 
        return NULL;
 }
@@ -1681,7 +1695,7 @@ static void prep_temp_blob(struct diff_tempfile *temp,
 
        fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
        if (fd < 0)
-               die("unable to create temp-file");
+               die("unable to create temp-file: %s", strerror(errno));
        if (write_in_full(fd, blob, size) != size)
                die("unable to write temp-file");
        close(fd);