4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "cache-tree.h"
17 * --check turns on checking that the working tree matches the
18 * files that are being modified, but doesn't apply the patch
19 * --stat does just a diffstat, and doesn't actually apply
20 * --numstat does numeric diffstat, and doesn't actually apply
21 * --index-info shows the old and new index info for paths if available.
22 * --index updates the cache as well.
23 * --cached updates only the cache without ever touching the working tree.
25 static const char *prefix
;
26 static int prefix_length
= -1;
27 static int newfd
= -1;
29 static int unidiff_zero
;
30 static int p_value
= 1;
31 static int p_value_known
;
32 static int check_index
;
33 static int update_index
;
40 static int apply_in_reverse
;
41 static int apply_with_reject
;
42 static int apply_verbosely
;
44 static int show_index_info
;
45 static int line_termination
= '\n';
46 static unsigned long p_context
= ULONG_MAX
;
47 static const char apply_usage
[] =
48 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
50 static enum whitespace_eol
{
55 } new_whitespace
= warn_on_whitespace
;
56 static int whitespace_error
;
57 static int squelch_whitespace_errors
= 5;
58 static int applied_after_fixing_ws
;
59 static const char *patch_input_file
;
61 static void parse_whitespace_option(const char *option
)
64 new_whitespace
= warn_on_whitespace
;
67 if (!strcmp(option
, "warn")) {
68 new_whitespace
= warn_on_whitespace
;
71 if (!strcmp(option
, "nowarn")) {
72 new_whitespace
= nowarn_whitespace
;
75 if (!strcmp(option
, "error")) {
76 new_whitespace
= error_on_whitespace
;
79 if (!strcmp(option
, "error-all")) {
80 new_whitespace
= error_on_whitespace
;
81 squelch_whitespace_errors
= 0;
84 if (!strcmp(option
, "strip")) {
85 new_whitespace
= strip_whitespace
;
88 die("unrecognized whitespace option '%s'", option
);
91 static void set_default_whitespace_mode(const char *whitespace_option
)
93 if (!whitespace_option
&& !apply_default_whitespace
) {
94 new_whitespace
= (apply
101 * For "diff-stat" like behaviour, we keep track of the biggest change
102 * we've seen, and the longest filename. That allows us to do simple
105 static int max_change
, max_len
;
108 * Various "current state", notably line numbers and what
109 * file (and how) we're patching right now.. The "is_xxxx"
110 * things are flags, where -1 means "don't know yet".
112 static int linenr
= 1;
115 * This represents one "hunk" from a patch, starting with
116 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
117 * patch text is pointed at by patch, and its byte length
118 * is stored in size. leading and trailing are the number
122 unsigned long leading
, trailing
;
123 unsigned long oldpos
, oldlines
;
124 unsigned long newpos
, newlines
;
128 struct fragment
*next
;
132 * When dealing with a binary patch, we reuse "leading" field
133 * to store the type of the binary hunk, either deflated "delta"
134 * or deflated "literal".
136 #define binary_patch_method leading
137 #define BINARY_DELTA_DEFLATED 1
138 #define BINARY_LITERAL_DEFLATED 2
141 char *new_name
, *old_name
, *def_name
;
142 unsigned int old_mode
, new_mode
;
143 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
145 unsigned long deflate_origlen
;
146 int lines_added
, lines_deleted
;
148 unsigned int is_toplevel_relative
:1;
149 unsigned int inaccurate_eof
:1;
150 unsigned int is_binary
:1;
151 unsigned int is_copy
:1;
152 unsigned int is_rename
:1;
153 struct fragment
*fragments
;
155 unsigned long resultsize
;
156 char old_sha1_prefix
[41];
157 char new_sha1_prefix
[41];
161 static void say_patch_name(FILE *output
, const char *pre
, struct patch
*patch
, const char *post
)
164 if (patch
->old_name
&& patch
->new_name
&&
165 strcmp(patch
->old_name
, patch
->new_name
)) {
166 write_name_quoted(NULL
, 0, patch
->old_name
, 1, output
);
167 fputs(" => ", output
);
168 write_name_quoted(NULL
, 0, patch
->new_name
, 1, output
);
171 const char *n
= patch
->new_name
;
174 write_name_quoted(NULL
, 0, n
, 1, output
);
179 #define CHUNKSIZE (8192)
182 static void *read_patch_file(int fd
, unsigned long *sizep
)
186 strbuf_init(&buf
, 0);
187 if (strbuf_read(&buf
, fd
, 0) < 0)
188 die("git-apply: read returned %s", strerror(errno
));
192 * Make sure that we have some slop in the buffer
193 * so that we can do speculative "memcmp" etc, and
194 * see to it that it is NUL-filled.
196 strbuf_grow(&buf
, SLOP
);
197 memset(buf
.buf
+ buf
.len
, 0, SLOP
);
198 return strbuf_detach(&buf
);
201 static unsigned long linelen(const char *buffer
, unsigned long size
)
203 unsigned long len
= 0;
206 if (*buffer
++ == '\n')
212 static int is_dev_null(const char *str
)
214 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
220 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
222 if (c
== ' ' && !(terminate
& TERM_SPACE
))
224 if (c
== '\t' && !(terminate
& TERM_TAB
))
230 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
233 const char *start
= line
;
237 /* Proposed "new-style" GNU patch/diff format; see
238 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
240 name
= unquote_c_style(line
, NULL
);
244 cp
= strchr(name
, '/');
251 /* name can later be freed, so we need
252 * to memmove, not just return cp
254 memmove(name
, cp
, strlen(cp
) + 1);
271 if (name_terminate(start
, line
-start
, c
, terminate
))
275 if (c
== '/' && !--p_value
)
285 * Generally we prefer the shorter name, especially
286 * if the other one is just a variation of that with
287 * something else tacked on to the end (ie "file.orig"
291 int deflen
= strlen(def
);
292 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
296 name
= xmalloc(len
+ 1);
297 memcpy(name
, start
, len
);
303 static int count_slashes(const char *cp
)
315 * Given the string after "--- " or "+++ ", guess the appropriate
316 * p_value for the given patch.
318 static int guess_p_value(const char *nameline
)
323 if (is_dev_null(nameline
))
325 name
= find_name(nameline
, NULL
, 0, TERM_SPACE
| TERM_TAB
);
328 cp
= strchr(name
, '/');
333 * Does it begin with "a/$our-prefix" and such? Then this is
334 * very likely to apply to our directory.
336 if (!strncmp(name
, prefix
, prefix_length
))
337 val
= count_slashes(prefix
);
340 if (!strncmp(cp
, prefix
, prefix_length
))
341 val
= count_slashes(prefix
) + 1;
349 * Get the name etc info from the --/+++ lines of a traditional patch header
351 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
352 * files, we can happily check the index for a match, but for creating a
353 * new file we should try to match whatever "patch" does. I have no idea.
355 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
359 first
+= 4; /* skip "--- " */
360 second
+= 4; /* skip "+++ " */
361 if (!p_value_known
) {
363 p
= guess_p_value(first
);
364 q
= guess_p_value(second
);
366 if (0 <= p
&& p
== q
) {
371 if (is_dev_null(first
)) {
373 patch
->is_delete
= 0;
374 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
375 patch
->new_name
= name
;
376 } else if (is_dev_null(second
)) {
378 patch
->is_delete
= 1;
379 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
380 patch
->old_name
= name
;
382 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
383 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
384 patch
->old_name
= patch
->new_name
= name
;
387 die("unable to find filename in patch at line %d", linenr
);
390 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
396 * We're anal about diff header consistency, to make
397 * sure that we don't end up having strange ambiguous
398 * patches floating around.
400 * As a result, gitdiff_{old|new}name() will check
401 * their names against any previous information, just
404 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
406 if (!orig_name
&& !isnull
)
407 return find_name(line
, NULL
, p_value
, TERM_TAB
);
416 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
417 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
418 if (!another
|| memcmp(another
, name
, len
))
419 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
424 /* expect "/dev/null" */
425 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
426 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
431 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
433 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
437 static int gitdiff_newname(const char *line
, struct patch
*patch
)
439 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
443 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
445 patch
->old_mode
= strtoul(line
, NULL
, 8);
449 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
451 patch
->new_mode
= strtoul(line
, NULL
, 8);
455 static int gitdiff_delete(const char *line
, struct patch
*patch
)
457 patch
->is_delete
= 1;
458 patch
->old_name
= patch
->def_name
;
459 return gitdiff_oldmode(line
, patch
);
462 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
465 patch
->new_name
= patch
->def_name
;
466 return gitdiff_newmode(line
, patch
);
469 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
472 patch
->old_name
= find_name(line
, NULL
, 0, 0);
476 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
479 patch
->new_name
= find_name(line
, NULL
, 0, 0);
483 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
485 patch
->is_rename
= 1;
486 patch
->old_name
= find_name(line
, NULL
, 0, 0);
490 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
492 patch
->is_rename
= 1;
493 patch
->new_name
= find_name(line
, NULL
, 0, 0);
497 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
499 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
504 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
506 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
511 static int gitdiff_index(const char *line
, struct patch
*patch
)
513 /* index line is N hexadecimal, "..", N hexadecimal,
514 * and optional space with octal mode.
516 const char *ptr
, *eol
;
519 ptr
= strchr(line
, '.');
520 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
523 memcpy(patch
->old_sha1_prefix
, line
, len
);
524 patch
->old_sha1_prefix
[len
] = 0;
527 ptr
= strchr(line
, ' ');
528 eol
= strchr(line
, '\n');
530 if (!ptr
|| eol
< ptr
)
536 memcpy(patch
->new_sha1_prefix
, line
, len
);
537 patch
->new_sha1_prefix
[len
] = 0;
539 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
544 * This is normal for a diff that doesn't change anything: we'll fall through
545 * into the next diff. Tell the parser to break out.
547 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
552 static const char *stop_at_slash(const char *line
, int llen
)
556 for (i
= 0; i
< llen
; i
++) {
564 /* This is to extract the same name that appears on "diff --git"
565 * line. We do not find and return anything if it is a rename
566 * patch, and it is OK because we will find the name elsewhere.
567 * We need to reliably find name only when it is mode-change only,
568 * creation or deletion of an empty file. In any of these cases,
569 * both sides are the same name under a/ and b/ respectively.
571 static char *git_header_name(char *line
, int llen
)
575 const char *second
= NULL
;
577 line
+= strlen("diff --git ");
578 llen
-= strlen("diff --git ");
582 char *first
= unquote_c_style(line
, &second
);
586 /* advance to the first slash */
587 cp
= stop_at_slash(first
, strlen(first
));
588 if (!cp
|| cp
== first
) {
589 /* we do not accept absolute paths */
595 memmove(first
, cp
+1, len
+1); /* including NUL */
597 /* second points at one past closing dq of name.
598 * find the second name.
600 while ((second
< line
+ llen
) && isspace(*second
))
603 if (line
+ llen
<= second
)
604 goto free_first_and_fail
;
605 if (*second
== '"') {
606 char *sp
= unquote_c_style(second
, NULL
);
608 goto free_first_and_fail
;
609 cp
= stop_at_slash(sp
, strlen(sp
));
610 if (!cp
|| cp
== sp
) {
613 goto free_first_and_fail
;
615 /* They must match, otherwise ignore */
616 if (strcmp(cp
+1, first
))
617 goto free_both_and_fail
;
622 /* unquoted second */
623 cp
= stop_at_slash(second
, line
+ llen
- second
);
624 if (!cp
|| cp
== second
)
625 goto free_first_and_fail
;
627 if (line
+ llen
- cp
!= len
+ 1 ||
628 memcmp(first
, cp
, len
))
629 goto free_first_and_fail
;
633 /* unquoted first name */
634 name
= stop_at_slash(line
, llen
);
635 if (!name
|| name
== line
)
640 /* since the first name is unquoted, a dq if exists must be
641 * the beginning of the second name.
643 for (second
= name
; second
< line
+ llen
; second
++) {
644 if (*second
== '"') {
645 const char *cp
= second
;
647 char *sp
= unquote_c_style(second
, NULL
);
651 np
= stop_at_slash(sp
, strlen(sp
));
652 if (!np
|| np
== sp
) {
653 free_second_and_fail
:
659 if (len
< cp
- name
&&
660 !strncmp(np
, name
, len
) &&
661 isspace(name
[len
])) {
663 memmove(sp
, np
, len
+ 1);
666 goto free_second_and_fail
;
671 * Accept a name only if it shows up twice, exactly the same
674 for (len
= 0 ; ; len
++) {
689 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
690 char *ret
= xmalloc(len
+ 1);
691 memcpy(ret
, name
, len
);
700 /* Verify that we recognize the lines following a git header */
701 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
703 unsigned long offset
;
705 /* A git diff has explicit new/delete information, so we don't guess */
707 patch
->is_delete
= 0;
710 * Some things may not have the old name in the
711 * rest of the headers anywhere (pure mode changes,
712 * or removing or adding empty files), so we get
713 * the default name from the header.
715 patch
->def_name
= git_header_name(line
, len
);
720 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
721 static const struct opentry
{
723 int (*fn
)(const char *, struct patch
*);
725 { "@@ -", gitdiff_hdrend
},
726 { "--- ", gitdiff_oldname
},
727 { "+++ ", gitdiff_newname
},
728 { "old mode ", gitdiff_oldmode
},
729 { "new mode ", gitdiff_newmode
},
730 { "deleted file mode ", gitdiff_delete
},
731 { "new file mode ", gitdiff_newfile
},
732 { "copy from ", gitdiff_copysrc
},
733 { "copy to ", gitdiff_copydst
},
734 { "rename old ", gitdiff_renamesrc
},
735 { "rename new ", gitdiff_renamedst
},
736 { "rename from ", gitdiff_renamesrc
},
737 { "rename to ", gitdiff_renamedst
},
738 { "similarity index ", gitdiff_similarity
},
739 { "dissimilarity index ", gitdiff_dissimilarity
},
740 { "index ", gitdiff_index
},
741 { "", gitdiff_unrecognized
},
745 len
= linelen(line
, size
);
746 if (!len
|| line
[len
-1] != '\n')
748 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
749 const struct opentry
*p
= optable
+ i
;
750 int oplen
= strlen(p
->str
);
751 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
753 if (p
->fn(line
+ oplen
, patch
) < 0)
762 static int parse_num(const char *line
, unsigned long *p
)
768 *p
= strtoul(line
, &ptr
, 10);
772 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
773 unsigned long *p1
, unsigned long *p2
)
777 if (offset
< 0 || offset
>= len
)
782 digits
= parse_num(line
, p1
);
792 digits
= parse_num(line
+1, p2
);
804 if (memcmp(line
, expect
, ex
))
811 * Parse a unified diff fragment header of the
812 * form "@@ -a,b +c,d @@"
814 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
818 if (!len
|| line
[len
-1] != '\n')
821 /* Figure out the number of lines in a fragment */
822 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
823 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
828 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
830 unsigned long offset
, len
;
832 patch
->is_toplevel_relative
= 0;
833 patch
->is_rename
= patch
->is_copy
= 0;
834 patch
->is_new
= patch
->is_delete
= -1;
835 patch
->old_mode
= patch
->new_mode
= 0;
836 patch
->old_name
= patch
->new_name
= NULL
;
837 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
838 unsigned long nextlen
;
840 len
= linelen(line
, size
);
844 /* Testing this early allows us to take a few shortcuts.. */
849 * Make sure we don't find any unconnected patch fragments.
850 * That's a sign that we didn't find a header, and that a
851 * patch has become corrupted/broken up.
853 if (!memcmp("@@ -", line
, 4)) {
854 struct fragment dummy
;
855 if (parse_fragment_header(line
, len
, &dummy
) < 0)
857 die("patch fragment without header at line %d: %.*s",
858 linenr
, (int)len
-1, line
);
865 * Git patch? It might not have a real patch, just a rename
866 * or mode change, so we handle that specially
868 if (!memcmp("diff --git ", line
, 11)) {
869 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
870 if (git_hdr_len
<= len
)
872 if (!patch
->old_name
&& !patch
->new_name
) {
873 if (!patch
->def_name
)
874 die("git diff header lacks filename information (line %d)", linenr
);
875 patch
->old_name
= patch
->new_name
= patch
->def_name
;
877 patch
->is_toplevel_relative
= 1;
878 *hdrsize
= git_hdr_len
;
882 /** --- followed by +++ ? */
883 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
887 * We only accept unified patches, so we want it to
888 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
891 nextlen
= linelen(line
+ len
, size
- len
);
892 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
895 /* Ok, we'll consider it a patch */
896 parse_traditional_patch(line
, line
+len
, patch
);
897 *hdrsize
= len
+ nextlen
;
904 static void check_whitespace(const char *line
, int len
)
906 const char *err
= "Adds trailing whitespace";
911 * We know len is at least two, since we have a '+' and we
912 * checked that the last character was a '\n' before calling
913 * this function. That is, an addition of an empty line would
914 * check the '+' here. Sneaky...
916 if (isspace(line
[len
-2]))
920 * Make sure that there is no space followed by a tab in
923 err
= "Space in indent is followed by a tab";
924 for (i
= 1; i
< len
; i
++) {
925 if (line
[i
] == '\t') {
929 else if (line
[i
] == ' ')
938 if (squelch_whitespace_errors
&&
939 squelch_whitespace_errors
< whitespace_error
)
942 fprintf(stderr
, "%s.\n%s:%d:%.*s\n",
943 err
, patch_input_file
, linenr
, len
-2, line
+1);
948 * Parse a unified diff. Note that this really needs to parse each
949 * fragment separately, since the only way to know the difference
950 * between a "---" that is part of a patch, and a "---" that starts
951 * the next patch is to look at the line counts..
953 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
956 int len
= linelen(line
, size
), offset
;
957 unsigned long oldlines
, newlines
;
958 unsigned long leading
, trailing
;
960 offset
= parse_fragment_header(line
, len
, fragment
);
963 oldlines
= fragment
->oldlines
;
964 newlines
= fragment
->newlines
;
968 /* Parse the thing.. */
975 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
976 if (!oldlines
&& !newlines
)
978 len
= linelen(line
, size
);
979 if (!len
|| line
[len
-1] != '\n')
984 case '\n': /* newer GNU diff, an empty context line */
988 if (!deleted
&& !added
)
993 if (apply_in_reverse
&&
994 new_whitespace
!= nowarn_whitespace
)
995 check_whitespace(line
, len
);
1001 if (!apply_in_reverse
&&
1002 new_whitespace
!= nowarn_whitespace
)
1003 check_whitespace(line
, len
);
1009 /* We allow "\ No newline at end of file". Depending
1010 * on locale settings when the patch was produced we
1011 * don't know what this line looks like. The only
1012 * thing we do know is that it begins with "\ ".
1013 * Checking for 12 is just for sanity check -- any
1014 * l10n of "\ No newline..." is at least that long.
1017 if (len
< 12 || memcmp(line
, "\\ ", 2))
1022 if (oldlines
|| newlines
)
1024 fragment
->leading
= leading
;
1025 fragment
->trailing
= trailing
;
1027 /* If a fragment ends with an incomplete line, we failed to include
1028 * it in the above loop because we hit oldlines == newlines == 0
1031 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1032 offset
+= linelen(line
, size
);
1034 patch
->lines_added
+= added
;
1035 patch
->lines_deleted
+= deleted
;
1037 if (0 < patch
->is_new
&& oldlines
)
1038 return error("new file depends on old contents");
1039 if (0 < patch
->is_delete
&& newlines
)
1040 return error("deleted file still has contents");
1044 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
1046 unsigned long offset
= 0;
1047 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1048 struct fragment
**fragp
= &patch
->fragments
;
1050 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1051 struct fragment
*fragment
;
1054 fragment
= xcalloc(1, sizeof(*fragment
));
1055 len
= parse_fragment(line
, size
, patch
, fragment
);
1057 die("corrupt patch at line %d", linenr
);
1058 fragment
->patch
= line
;
1059 fragment
->size
= len
;
1060 oldlines
+= fragment
->oldlines
;
1061 newlines
+= fragment
->newlines
;
1062 context
+= fragment
->leading
+ fragment
->trailing
;
1065 fragp
= &fragment
->next
;
1073 * If something was removed (i.e. we have old-lines) it cannot
1074 * be creation, and if something was added it cannot be
1075 * deletion. However, the reverse is not true; --unified=0
1076 * patches that only add are not necessarily creation even
1077 * though they do not have any old lines, and ones that only
1078 * delete are not necessarily deletion.
1080 * Unfortunately, a real creation/deletion patch do _not_ have
1081 * any context line by definition, so we cannot safely tell it
1082 * apart with --unified=0 insanity. At least if the patch has
1083 * more than one hunk it is not creation or deletion.
1085 if (patch
->is_new
< 0 &&
1086 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1088 if (patch
->is_delete
< 0 &&
1089 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1090 patch
->is_delete
= 0;
1091 if (!unidiff_zero
|| context
) {
1092 /* If the user says the patch is not generated with
1093 * --unified=0, or if we have seen context lines,
1094 * then not having oldlines means the patch is creation,
1095 * and not having newlines means the patch is deletion.
1097 if (patch
->is_new
< 0 && !oldlines
) {
1099 patch
->old_name
= NULL
;
1101 if (patch
->is_delete
< 0 && !newlines
) {
1102 patch
->is_delete
= 1;
1103 patch
->new_name
= NULL
;
1107 if (0 < patch
->is_new
&& oldlines
)
1108 die("new file %s depends on old contents", patch
->new_name
);
1109 if (0 < patch
->is_delete
&& newlines
)
1110 die("deleted file %s still has contents", patch
->old_name
);
1111 if (!patch
->is_delete
&& !newlines
&& context
)
1112 fprintf(stderr
, "** warning: file %s becomes empty but "
1113 "is not deleted\n", patch
->new_name
);
1118 static inline int metadata_changes(struct patch
*patch
)
1120 return patch
->is_rename
> 0 ||
1121 patch
->is_copy
> 0 ||
1122 patch
->is_new
> 0 ||
1124 (patch
->old_mode
&& patch
->new_mode
&&
1125 patch
->old_mode
!= patch
->new_mode
);
1128 static char *inflate_it(const void *data
, unsigned long size
,
1129 unsigned long inflated_size
)
1135 memset(&stream
, 0, sizeof(stream
));
1137 stream
.next_in
= (unsigned char *)data
;
1138 stream
.avail_in
= size
;
1139 stream
.next_out
= out
= xmalloc(inflated_size
);
1140 stream
.avail_out
= inflated_size
;
1141 inflateInit(&stream
);
1142 st
= inflate(&stream
, Z_FINISH
);
1143 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1150 static struct fragment
*parse_binary_hunk(char **buf_p
,
1151 unsigned long *sz_p
,
1155 /* Expect a line that begins with binary patch method ("literal"
1156 * or "delta"), followed by the length of data before deflating.
1157 * a sequence of 'length-byte' followed by base-85 encoded data
1158 * should follow, terminated by a newline.
1160 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1161 * and we would limit the patch line to 66 characters,
1162 * so one line can fit up to 13 groups that would decode
1163 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1164 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1167 unsigned long size
= *sz_p
;
1168 char *buffer
= *buf_p
;
1170 unsigned long origlen
;
1173 struct fragment
*frag
;
1175 llen
= linelen(buffer
, size
);
1180 if (!prefixcmp(buffer
, "delta ")) {
1181 patch_method
= BINARY_DELTA_DEFLATED
;
1182 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1184 else if (!prefixcmp(buffer
, "literal ")) {
1185 patch_method
= BINARY_LITERAL_DEFLATED
;
1186 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1194 int byte_length
, max_byte_length
, newsize
;
1195 llen
= linelen(buffer
, size
);
1199 /* consume the blank line */
1204 /* Minimum line is "A00000\n" which is 7-byte long,
1205 * and the line length must be multiple of 5 plus 2.
1207 if ((llen
< 7) || (llen
-2) % 5)
1209 max_byte_length
= (llen
- 2) / 5 * 4;
1210 byte_length
= *buffer
;
1211 if ('A' <= byte_length
&& byte_length
<= 'Z')
1212 byte_length
= byte_length
- 'A' + 1;
1213 else if ('a' <= byte_length
&& byte_length
<= 'z')
1214 byte_length
= byte_length
- 'a' + 27;
1217 /* if the input length was not multiple of 4, we would
1218 * have filler at the end but the filler should never
1221 if (max_byte_length
< byte_length
||
1222 byte_length
<= max_byte_length
- 4)
1224 newsize
= hunk_size
+ byte_length
;
1225 data
= xrealloc(data
, newsize
);
1226 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1228 hunk_size
= newsize
;
1233 frag
= xcalloc(1, sizeof(*frag
));
1234 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1238 frag
->size
= origlen
;
1242 frag
->binary_patch_method
= patch_method
;
1248 error("corrupt binary patch at line %d: %.*s",
1249 linenr
-1, llen
-1, buffer
);
1253 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1255 /* We have read "GIT binary patch\n"; what follows is a line
1256 * that says the patch method (currently, either "literal" or
1257 * "delta") and the length of data before deflating; a
1258 * sequence of 'length-byte' followed by base-85 encoded data
1261 * When a binary patch is reversible, there is another binary
1262 * hunk in the same format, starting with patch method (either
1263 * "literal" or "delta") with the length of data, and a sequence
1264 * of length-byte + base-85 encoded data, terminated with another
1265 * empty line. This data, when applied to the postimage, produces
1268 struct fragment
*forward
;
1269 struct fragment
*reverse
;
1273 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1274 if (!forward
&& !status
)
1275 /* there has to be one hunk (forward hunk) */
1276 return error("unrecognized binary patch at line %d", linenr
-1);
1278 /* otherwise we already gave an error message */
1281 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1285 /* not having reverse hunk is not an error, but having
1286 * a corrupt reverse hunk is.
1288 free((void*) forward
->patch
);
1292 forward
->next
= reverse
;
1293 patch
->fragments
= forward
;
1294 patch
->is_binary
= 1;
1298 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1300 int hdrsize
, patchsize
;
1301 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1306 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
1309 static const char *binhdr
[] = {
1314 static const char git_binary
[] = "GIT binary patch\n";
1316 int hd
= hdrsize
+ offset
;
1317 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1319 if (llen
== sizeof(git_binary
) - 1 &&
1320 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1323 used
= parse_binary(buffer
+ hd
+ llen
,
1324 size
- hd
- llen
, patch
);
1326 patchsize
= used
+ llen
;
1330 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1331 for (i
= 0; binhdr
[i
]; i
++) {
1332 int len
= strlen(binhdr
[i
]);
1333 if (len
< size
- hd
&&
1334 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1336 patch
->is_binary
= 1;
1343 /* Empty patch cannot be applied if it is a text patch
1344 * without metadata change. A binary patch appears
1347 if ((apply
|| check
) &&
1348 (!patch
->is_binary
&& !metadata_changes(patch
)))
1349 die("patch with only garbage at line %d", linenr
);
1352 return offset
+ hdrsize
+ patchsize
;
1355 #define swap(a,b) myswap((a),(b),sizeof(a))
1357 #define myswap(a, b, size) do { \
1358 unsigned char mytmp[size]; \
1359 memcpy(mytmp, &a, size); \
1360 memcpy(&a, &b, size); \
1361 memcpy(&b, mytmp, size); \
1364 static void reverse_patches(struct patch
*p
)
1366 for (; p
; p
= p
->next
) {
1367 struct fragment
*frag
= p
->fragments
;
1369 swap(p
->new_name
, p
->old_name
);
1370 swap(p
->new_mode
, p
->old_mode
);
1371 swap(p
->is_new
, p
->is_delete
);
1372 swap(p
->lines_added
, p
->lines_deleted
);
1373 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1375 for (; frag
; frag
= frag
->next
) {
1376 swap(frag
->newpos
, frag
->oldpos
);
1377 swap(frag
->newlines
, frag
->oldlines
);
1382 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1383 static const char minuses
[]= "----------------------------------------------------------------------";
1385 static void show_stats(struct patch
*patch
)
1387 const char *prefix
= "";
1388 char *name
= patch
->new_name
;
1390 int len
, max
, add
, del
, total
;
1393 name
= patch
->old_name
;
1395 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
1396 qname
= xmalloc(len
+ 1);
1397 quote_c_style(name
, qname
, NULL
, 0);
1402 * "scale" the filename
1413 slash
= strchr(name
, '/');
1420 * scale the add/delete
1426 add
= patch
->lines_added
;
1427 del
= patch
->lines_deleted
;
1430 if (max_change
> 0) {
1431 total
= (total
* max
+ max_change
/ 2) / max_change
;
1432 add
= (add
* max
+ max_change
/ 2) / max_change
;
1435 if (patch
->is_binary
)
1436 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1438 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1439 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1440 add
, pluses
, del
, minuses
);
1444 static int read_old_data(struct stat
*st
, const char *path
, char **buf_p
, unsigned long *alloc_p
, unsigned long *size_p
)
1449 unsigned long size
= *size_p
;
1452 switch (st
->st_mode
& S_IFMT
) {
1454 return readlink(path
, buf
, size
) != size
;
1456 fd
= open(path
, O_RDONLY
);
1458 return error("unable to open %s", path
);
1461 ssize_t ret
= xread(fd
, buf
+ got
, size
- got
);
1467 strbuf_init(&nbuf
, 0);
1468 if (convert_to_git(path
, buf
, size
, &nbuf
)) {
1471 *alloc_p
= nbuf
.alloc
;
1480 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
, int *lines
)
1483 unsigned long start
, backwards
, forwards
;
1485 if (fragsize
> size
)
1490 unsigned long offset
= 0;
1492 while (offset
+ fragsize
<= size
) {
1493 if (buf
[offset
++] == '\n') {
1501 /* Exact line number? */
1502 if ((start
+ fragsize
<= size
) &&
1503 !memcmp(buf
+ start
, fragment
, fragsize
))
1507 * There's probably some smart way to do this, but I'll leave
1508 * that to the smart and beautiful people. I'm simple and stupid.
1512 for (i
= 0; ; i
++) {
1519 if (forwards
+ fragsize
> size
)
1525 } while (backwards
&& buf
[backwards
-1] != '\n');
1528 while (forwards
+ fragsize
<= size
) {
1529 if (buf
[forwards
++] == '\n')
1535 if (try + fragsize
> size
)
1537 if (memcmp(buf
+ try, fragment
, fragsize
))
1547 * We should start searching forward and backward.
1552 static void remove_first_line(const char **rbuf
, int *rsize
)
1554 const char *buf
= *rbuf
;
1556 unsigned long offset
;
1558 while (offset
<= size
) {
1559 if (buf
[offset
++] == '\n')
1562 *rsize
= size
- offset
;
1563 *rbuf
= buf
+ offset
;
1566 static void remove_last_line(const char **rbuf
, int *rsize
)
1568 const char *buf
= *rbuf
;
1570 unsigned long offset
;
1572 while (offset
> 0) {
1573 if (buf
[--offset
] == '\n')
1576 *rsize
= offset
+ 1;
1579 struct buffer_desc
{
1582 unsigned long alloc
;
1585 static int apply_line(char *output
, const char *patch
, int plen
)
1587 /* plen is number of bytes to be copied from patch,
1588 * starting at patch+1 (patch[0] is '+'). Typically
1589 * patch[plen] is '\n', unless this is the incomplete
1593 int add_nl_to_tail
= 0;
1595 int last_tab_in_indent
= -1;
1596 int last_space_in_indent
= -1;
1597 int need_fix_leading_space
= 0;
1600 if ((new_whitespace
!= strip_whitespace
) || !whitespace_error
||
1602 memcpy(output
, patch
+ 1, plen
);
1606 if (1 < plen
&& isspace(patch
[plen
-1])) {
1607 if (patch
[plen
] == '\n')
1610 while (0 < plen
&& isspace(patch
[plen
]))
1615 for (i
= 1; i
< plen
; i
++) {
1618 last_tab_in_indent
= i
;
1619 if (0 <= last_space_in_indent
)
1620 need_fix_leading_space
= 1;
1623 last_space_in_indent
= i
;
1629 if (need_fix_leading_space
) {
1630 /* between patch[1..last_tab_in_indent] strip the
1631 * funny spaces, updating them to tab as needed.
1633 for (i
= 1; i
< last_tab_in_indent
; i
++, plen
--) {
1637 else if ((i
% 8) == 0)
1641 i
= last_tab_in_indent
;
1646 memcpy(output
, patch
+ i
, plen
);
1648 output
[plen
++] = '\n';
1650 applied_after_fixing_ws
++;
1651 return output
+ plen
- buf
;
1654 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
, int inaccurate_eof
)
1656 int match_beginning
, match_end
;
1657 char *buf
= desc
->buffer
;
1658 const char *patch
= frag
->patch
;
1659 int offset
, size
= frag
->size
;
1660 char *old
= xmalloc(size
);
1661 char *new = xmalloc(size
);
1662 const char *oldlines
, *newlines
;
1663 int oldsize
= 0, newsize
= 0;
1664 int new_blank_lines_at_end
= 0;
1665 unsigned long leading
, trailing
;
1670 int len
= linelen(patch
, size
);
1672 int added_blank_line
= 0;
1678 * "plen" is how much of the line we should use for
1679 * the actual patch data. Normally we just remove the
1680 * first character on the line, but if the line is
1681 * followed by "\ No newline", then we also remove the
1682 * last one (which is the newline, of course).
1685 if (len
< size
&& patch
[len
] == '\\')
1688 if (apply_in_reverse
) {
1691 else if (first
== '+')
1697 /* Newer GNU diff, empty context line */
1699 /* ... followed by '\No newline'; nothing */
1701 old
[oldsize
++] = '\n';
1702 new[newsize
++] = '\n';
1706 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1710 /* Fall-through for ' ' */
1712 if (first
!= '+' || !no_add
) {
1713 int added
= apply_line(new + newsize
, patch
,
1717 added
== 1 && new[newsize
-1] == '\n')
1718 added_blank_line
= 1;
1721 case '@': case '\\':
1722 /* Ignore it, we already handled it */
1725 if (apply_verbosely
)
1726 error("invalid start of line: '%c'", first
);
1729 if (added_blank_line
)
1730 new_blank_lines_at_end
++;
1732 new_blank_lines_at_end
= 0;
1737 if (inaccurate_eof
&& oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1738 newsize
> 0 && new[newsize
- 1] == '\n') {
1745 leading
= frag
->leading
;
1746 trailing
= frag
->trailing
;
1749 * If we don't have any leading/trailing data in the patch,
1750 * we want it to match at the beginning/end of the file.
1752 * But that would break if the patch is generated with
1753 * --unified=0; sane people wouldn't do that to cause us
1754 * trouble, but we try to please not so sane ones as well.
1757 match_beginning
= (!leading
&& !frag
->oldpos
);
1761 match_beginning
= !leading
&& (frag
->oldpos
== 1);
1762 match_end
= !trailing
;
1768 offset
= find_offset(buf
, desc
->size
,
1769 oldlines
, oldsize
, pos
, &lines
);
1770 if (match_end
&& offset
+ oldsize
!= desc
->size
)
1772 if (match_beginning
&& offset
)
1776 unsigned long size
, alloc
;
1778 if (new_whitespace
== strip_whitespace
&&
1779 (desc
->size
- oldsize
- offset
== 0)) /* end of file? */
1780 newsize
-= new_blank_lines_at_end
;
1782 diff
= newsize
- oldsize
;
1783 size
= desc
->size
+ diff
;
1784 alloc
= desc
->alloc
;
1786 /* Warn if it was necessary to reduce the number
1789 if ((leading
!= frag
->leading
) ||
1790 (trailing
!= frag
->trailing
))
1791 fprintf(stderr
, "Context reduced to (%ld/%ld)"
1792 " to apply fragment at %d\n",
1793 leading
, trailing
, pos
+ lines
);
1796 alloc
= size
+ 8192;
1797 desc
->alloc
= alloc
;
1798 buf
= xrealloc(buf
, alloc
);
1802 memmove(buf
+ offset
+ newsize
,
1803 buf
+ offset
+ oldsize
,
1804 size
- offset
- newsize
);
1805 memcpy(buf
+ offset
, newlines
, newsize
);
1811 /* Am I at my context limits? */
1812 if ((leading
<= p_context
) && (trailing
<= p_context
))
1814 if (match_beginning
|| match_end
) {
1815 match_beginning
= match_end
= 0;
1818 /* Reduce the number of context lines
1819 * Reduce both leading and trailing if they are equal
1820 * otherwise just reduce the larger context.
1822 if (leading
>= trailing
) {
1823 remove_first_line(&oldlines
, &oldsize
);
1824 remove_first_line(&newlines
, &newsize
);
1828 if (trailing
> leading
) {
1829 remove_last_line(&oldlines
, &oldsize
);
1830 remove_last_line(&newlines
, &newsize
);
1835 if (offset
&& apply_verbosely
)
1836 error("while searching for:\n%.*s", oldsize
, oldlines
);
1843 static int apply_binary_fragment(struct buffer_desc
*desc
, struct patch
*patch
)
1845 unsigned long dst_size
;
1846 struct fragment
*fragment
= patch
->fragments
;
1850 /* Binary patch is irreversible without the optional second hunk */
1851 if (apply_in_reverse
) {
1852 if (!fragment
->next
)
1853 return error("cannot reverse-apply a binary patch "
1854 "without the reverse hunk to '%s'",
1856 ? patch
->new_name
: patch
->old_name
);
1857 fragment
= fragment
->next
;
1859 data
= (void*) fragment
->patch
;
1860 switch (fragment
->binary_patch_method
) {
1861 case BINARY_DELTA_DEFLATED
:
1862 result
= patch_delta(desc
->buffer
, desc
->size
,
1867 desc
->buffer
= result
;
1869 case BINARY_LITERAL_DEFLATED
:
1871 desc
->buffer
= data
;
1872 dst_size
= fragment
->size
;
1877 desc
->size
= desc
->alloc
= dst_size
;
1881 static int apply_binary(struct buffer_desc
*desc
, struct patch
*patch
)
1883 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1884 unsigned char sha1
[20];
1886 /* For safety, we require patch index line to contain
1887 * full 40-byte textual SHA1 for old and new, at least for now.
1889 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1890 strlen(patch
->new_sha1_prefix
) != 40 ||
1891 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1892 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1893 return error("cannot apply binary patch to '%s' "
1894 "without full index line", name
);
1896 if (patch
->old_name
) {
1897 /* See if the old one matches what the patch
1900 hash_sha1_file(desc
->buffer
, desc
->size
, blob_type
, sha1
);
1901 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1902 return error("the patch applies to '%s' (%s), "
1903 "which does not match the "
1904 "current contents.",
1905 name
, sha1_to_hex(sha1
));
1908 /* Otherwise, the old one must be empty. */
1910 return error("the patch applies to an empty "
1911 "'%s' but it is not empty", name
);
1914 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1915 if (is_null_sha1(sha1
)) {
1917 desc
->alloc
= desc
->size
= 0;
1918 desc
->buffer
= NULL
;
1919 return 0; /* deletion patch */
1922 if (has_sha1_file(sha1
)) {
1923 /* We already have the postimage */
1924 enum object_type type
;
1928 desc
->buffer
= read_sha1_file(sha1
, &type
, &size
);
1930 return error("the necessary postimage %s for "
1931 "'%s' cannot be read",
1932 patch
->new_sha1_prefix
, name
);
1933 desc
->alloc
= desc
->size
= size
;
1936 /* We have verified desc matches the preimage;
1937 * apply the patch data to it, which is stored
1938 * in the patch->fragments->{patch,size}.
1940 if (apply_binary_fragment(desc
, patch
))
1941 return error("binary patch does not apply to '%s'",
1944 /* verify that the result matches */
1945 hash_sha1_file(desc
->buffer
, desc
->size
, blob_type
, sha1
);
1946 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
1947 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
1953 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1955 struct fragment
*frag
= patch
->fragments
;
1956 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1958 if (patch
->is_binary
)
1959 return apply_binary(desc
, patch
);
1962 if (apply_one_fragment(desc
, frag
, patch
->inaccurate_eof
)) {
1963 error("patch failed: %s:%ld", name
, frag
->oldpos
);
1964 if (!apply_with_reject
)
1973 static int read_file_or_gitlink(struct cache_entry
*ce
, char **buf_p
,
1974 unsigned long *size_p
)
1979 if (S_ISGITLINK(ntohl(ce
->ce_mode
))) {
1980 *buf_p
= xmalloc(100);
1981 *size_p
= snprintf(*buf_p
, 100,
1982 "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
1984 enum object_type type
;
1985 *buf_p
= read_sha1_file(ce
->sha1
, &type
, size_p
);
1992 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
1995 unsigned long size
, alloc
;
1996 struct buffer_desc desc
;
2002 if (read_file_or_gitlink(ce
, &buf
, &size
))
2003 return error("read of %s failed", patch
->old_name
);
2005 } else if (patch
->old_name
) {
2006 if (S_ISGITLINK(patch
->old_mode
)) {
2008 read_file_or_gitlink(ce
, &buf
, &size
);
2011 * There is no way to apply subproject
2012 * patch without looking at the index.
2014 patch
->fragments
= NULL
;
2019 size
= xsize_t(st
->st_size
);
2020 alloc
= size
+ 8192;
2021 buf
= xmalloc(alloc
);
2022 if (read_old_data(st
, patch
->old_name
,
2023 &buf
, &alloc
, &size
))
2024 return error("read of %s failed",
2033 if (apply_fragments(&desc
, patch
) < 0)
2034 return -1; /* note with --reject this succeeds. */
2036 /* NUL terminate the result */
2037 if (desc
.alloc
<= desc
.size
)
2038 desc
.buffer
= xrealloc(desc
.buffer
, desc
.size
+ 1);
2039 desc
.buffer
[desc
.size
] = 0;
2041 patch
->result
= desc
.buffer
;
2042 patch
->resultsize
= desc
.size
;
2044 if (0 < patch
->is_delete
&& patch
->resultsize
)
2045 return error("removal patch leaves file contents");
2050 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
2053 if (!lstat(new_name
, &nst
)) {
2054 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2057 * A leading component of new_name might be a symlink
2058 * that is going to be removed with this patch, but
2059 * still pointing at somewhere that has the path.
2060 * In such a case, path "new_name" does not exist as
2061 * far as git is concerned.
2063 if (has_symlink_leading_path(new_name
, NULL
))
2066 return error("%s: already exists in working directory", new_name
);
2068 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2069 return error("%s: %s", new_name
, strerror(errno
));
2073 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
2075 if (S_ISGITLINK(ntohl(ce
->ce_mode
))) {
2076 if (!S_ISDIR(st
->st_mode
))
2080 return ce_match_stat(ce
, st
, 1);
2083 static int check_patch(struct patch
*patch
, struct patch
*prev_patch
)
2086 const char *old_name
= patch
->old_name
;
2087 const char *new_name
= patch
->new_name
;
2088 const char *name
= old_name
? old_name
: new_name
;
2089 struct cache_entry
*ce
= NULL
;
2092 patch
->rejected
= 1; /* we will drop this after we succeed */
2095 * Make sure that we do not have local modifications from the
2096 * index when we are looking at the index. Also make sure
2097 * we have the preimage file to be patched in the work tree,
2098 * unless --cached, which tells git to apply only in the index.
2102 unsigned st_mode
= 0;
2105 stat_ret
= lstat(old_name
, &st
);
2107 int pos
= cache_name_pos(old_name
, strlen(old_name
));
2109 return error("%s: does not exist in index",
2111 ce
= active_cache
[pos
];
2113 struct checkout costate
;
2114 if (errno
!= ENOENT
)
2115 return error("%s: %s", old_name
,
2118 costate
.base_dir
= "";
2119 costate
.base_dir_len
= 0;
2122 costate
.not_new
= 0;
2123 costate
.refresh_cache
= 1;
2124 if (checkout_entry(ce
,
2127 lstat(old_name
, &st
))
2130 if (!cached
&& verify_index_match(ce
, &st
))
2131 return error("%s: does not match index",
2134 st_mode
= ntohl(ce
->ce_mode
);
2135 } else if (stat_ret
< 0)
2136 return error("%s: %s", old_name
, strerror(errno
));
2139 st_mode
= ntohl(ce_mode_from_stat(ce
, st
.st_mode
));
2141 if (patch
->is_new
< 0)
2143 if (!patch
->old_mode
)
2144 patch
->old_mode
= st_mode
;
2145 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2146 return error("%s: wrong type", old_name
);
2147 if (st_mode
!= patch
->old_mode
)
2148 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
2149 old_name
, st_mode
, patch
->old_mode
);
2152 if (new_name
&& prev_patch
&& 0 < prev_patch
->is_delete
&&
2153 !strcmp(prev_patch
->old_name
, new_name
))
2154 /* A type-change diff is always split into a patch to
2155 * delete old, immediately followed by a patch to
2156 * create new (see diff.c::run_diff()); in such a case
2157 * it is Ok that the entry to be deleted by the
2158 * previous patch is still in the working tree and in
2166 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2168 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2170 return error("%s: already exists in index", new_name
);
2172 int err
= check_to_create_blob(new_name
, ok_if_exists
);
2176 if (!patch
->new_mode
) {
2177 if (0 < patch
->is_new
)
2178 patch
->new_mode
= S_IFREG
| 0644;
2180 patch
->new_mode
= patch
->old_mode
;
2184 if (new_name
&& old_name
) {
2185 int same
= !strcmp(old_name
, new_name
);
2186 if (!patch
->new_mode
)
2187 patch
->new_mode
= patch
->old_mode
;
2188 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2189 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2190 patch
->new_mode
, new_name
, patch
->old_mode
,
2191 same
? "" : " of ", same
? "" : old_name
);
2194 if (apply_data(patch
, &st
, ce
) < 0)
2195 return error("%s: patch does not apply", name
);
2196 patch
->rejected
= 0;
2200 static int check_patch_list(struct patch
*patch
)
2202 struct patch
*prev_patch
= NULL
;
2205 for (prev_patch
= NULL
; patch
; patch
= patch
->next
) {
2206 if (apply_verbosely
)
2207 say_patch_name(stderr
,
2208 "Checking patch ", patch
, "...\n");
2209 err
|= check_patch(patch
, prev_patch
);
2215 static void show_index_list(struct patch
*list
)
2217 struct patch
*patch
;
2219 /* Once we start supporting the reverse patch, it may be
2220 * worth showing the new sha1 prefix, but until then...
2222 for (patch
= list
; patch
; patch
= patch
->next
) {
2223 const unsigned char *sha1_ptr
;
2224 unsigned char sha1
[20];
2227 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2228 if (0 < patch
->is_new
)
2229 sha1_ptr
= null_sha1
;
2230 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2231 die("sha1 information is lacking or useless (%s).",
2236 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
2237 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
2238 quote_c_style(name
, NULL
, stdout
, 0);
2240 fputs(name
, stdout
);
2241 putchar(line_termination
);
2245 static void stat_patch_list(struct patch
*patch
)
2247 int files
, adds
, dels
;
2249 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
2251 adds
+= patch
->lines_added
;
2252 dels
+= patch
->lines_deleted
;
2256 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
2259 static void numstat_patch_list(struct patch
*patch
)
2261 for ( ; patch
; patch
= patch
->next
) {
2263 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2264 if (patch
->is_binary
)
2268 patch
->lines_added
, patch
->lines_deleted
);
2269 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
2270 quote_c_style(name
, NULL
, stdout
, 0);
2272 fputs(name
, stdout
);
2273 putchar(line_termination
);
2277 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
2280 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
2282 printf(" %s %s\n", newdelete
, name
);
2285 static void show_mode_change(struct patch
*p
, int show_name
)
2287 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
2289 printf(" mode change %06o => %06o %s\n",
2290 p
->old_mode
, p
->new_mode
, p
->new_name
);
2292 printf(" mode change %06o => %06o\n",
2293 p
->old_mode
, p
->new_mode
);
2297 static void show_rename_copy(struct patch
*p
)
2299 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
2300 const char *old
, *new;
2302 /* Find common prefix */
2306 const char *slash_old
, *slash_new
;
2307 slash_old
= strchr(old
, '/');
2308 slash_new
= strchr(new, '/');
2311 slash_old
- old
!= slash_new
- new ||
2312 memcmp(old
, new, slash_new
- new))
2314 old
= slash_old
+ 1;
2315 new = slash_new
+ 1;
2317 /* p->old_name thru old is the common prefix, and old and new
2318 * through the end of names are renames
2320 if (old
!= p
->old_name
)
2321 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
2322 (int)(old
- p
->old_name
), p
->old_name
,
2323 old
, new, p
->score
);
2325 printf(" %s %s => %s (%d%%)\n", renamecopy
,
2326 p
->old_name
, p
->new_name
, p
->score
);
2327 show_mode_change(p
, 0);
2330 static void summary_patch_list(struct patch
*patch
)
2334 for (p
= patch
; p
; p
= p
->next
) {
2336 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
2337 else if (p
->is_delete
)
2338 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
2340 if (p
->is_rename
|| p
->is_copy
)
2341 show_rename_copy(p
);
2344 printf(" rewrite %s (%d%%)\n",
2345 p
->new_name
, p
->score
);
2346 show_mode_change(p
, 0);
2349 show_mode_change(p
, 1);
2355 static void patch_stats(struct patch
*patch
)
2357 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
2359 if (lines
> max_change
)
2361 if (patch
->old_name
) {
2362 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
2364 len
= strlen(patch
->old_name
);
2368 if (patch
->new_name
) {
2369 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
2371 len
= strlen(patch
->new_name
);
2377 static void remove_file(struct patch
*patch
, int rmdir_empty
)
2380 if (remove_file_from_cache(patch
->old_name
) < 0)
2381 die("unable to remove %s from index", patch
->old_name
);
2382 cache_tree_invalidate_path(active_cache_tree
, patch
->old_name
);
2385 if (S_ISGITLINK(patch
->old_mode
)) {
2386 if (rmdir(patch
->old_name
))
2387 warning("unable to remove submodule %s",
2389 } else if (!unlink(patch
->old_name
) && rmdir_empty
) {
2390 char *name
= xstrdup(patch
->old_name
);
2391 char *end
= strrchr(name
, '/');
2396 end
= strrchr(name
, '/');
2403 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
2406 struct cache_entry
*ce
;
2407 int namelen
= strlen(path
);
2408 unsigned ce_size
= cache_entry_size(namelen
);
2413 ce
= xcalloc(1, ce_size
);
2414 memcpy(ce
->name
, path
, namelen
);
2415 ce
->ce_mode
= create_ce_mode(mode
);
2416 ce
->ce_flags
= htons(namelen
);
2417 if (S_ISGITLINK(mode
)) {
2418 const char *s
= buf
;
2420 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
2421 die("corrupt patch for subproject %s", path
);
2424 if (lstat(path
, &st
) < 0)
2425 die("unable to stat newly created file %s",
2427 fill_stat_cache_info(ce
, &st
);
2429 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
2430 die("unable to create backing store for newly created file %s", path
);
2432 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
2433 die("unable to add cache entry for %s", path
);
2436 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
2441 if (S_ISGITLINK(mode
)) {
2443 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
2445 return mkdir(path
, 0777);
2448 if (has_symlinks
&& S_ISLNK(mode
))
2449 /* Although buf:size is counted string, it also is NUL
2452 return symlink(buf
, path
);
2454 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
2458 strbuf_init(&nbuf
, 0);
2459 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
2465 int written
= xwrite(fd
, buf
, size
);
2467 die("writing file %s: %s", path
, strerror(errno
));
2469 die("out of space writing file %s", path
);
2474 die("closing file %s: %s", path
, strerror(errno
));
2475 strbuf_release(&nbuf
);
2480 * We optimistically assume that the directories exist,
2481 * which is true 99% of the time anyway. If they don't,
2482 * we create them and try again.
2484 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2488 if (!try_create_file(path
, mode
, buf
, size
))
2491 if (errno
== ENOENT
) {
2492 if (safe_create_leading_directories(path
))
2494 if (!try_create_file(path
, mode
, buf
, size
))
2498 if (errno
== EEXIST
|| errno
== EACCES
) {
2499 /* We may be trying to create a file where a directory
2503 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
2507 if (errno
== EEXIST
) {
2508 unsigned int nr
= getpid();
2511 const char *newpath
;
2512 newpath
= mkpath("%s~%u", path
, nr
);
2513 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2514 if (!rename(newpath
, path
))
2519 if (errno
!= EEXIST
)
2524 die("unable to write file %s mode %o", path
, mode
);
2527 static void create_file(struct patch
*patch
)
2529 char *path
= patch
->new_name
;
2530 unsigned mode
= patch
->new_mode
;
2531 unsigned long size
= patch
->resultsize
;
2532 char *buf
= patch
->result
;
2535 mode
= S_IFREG
| 0644;
2536 create_one_file(path
, mode
, buf
, size
);
2537 add_index_file(path
, mode
, buf
, size
);
2538 cache_tree_invalidate_path(active_cache_tree
, path
);
2541 /* phase zero is to remove, phase one is to create */
2542 static void write_out_one_result(struct patch
*patch
, int phase
)
2544 if (patch
->is_delete
> 0) {
2546 remove_file(patch
, 1);
2549 if (patch
->is_new
> 0 || patch
->is_copy
) {
2555 * Rename or modification boils down to the same
2556 * thing: remove the old, write the new
2559 remove_file(patch
, patch
->is_rename
);
2564 static int write_out_one_reject(struct patch
*patch
)
2567 char namebuf
[PATH_MAX
];
2568 struct fragment
*frag
;
2571 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
2572 if (!frag
->rejected
)
2578 if (apply_verbosely
)
2579 say_patch_name(stderr
,
2580 "Applied patch ", patch
, " cleanly.\n");
2584 /* This should not happen, because a removal patch that leaves
2585 * contents are marked "rejected" at the patch level.
2587 if (!patch
->new_name
)
2588 die("internal error");
2590 /* Say this even without --verbose */
2591 say_patch_name(stderr
, "Applying patch ", patch
, " with");
2592 fprintf(stderr
, " %d rejects...\n", cnt
);
2594 cnt
= strlen(patch
->new_name
);
2595 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
2596 cnt
= ARRAY_SIZE(namebuf
) - 5;
2598 "warning: truncating .rej filename to %.*s.rej",
2599 cnt
- 1, patch
->new_name
);
2601 memcpy(namebuf
, patch
->new_name
, cnt
);
2602 memcpy(namebuf
+ cnt
, ".rej", 5);
2604 rej
= fopen(namebuf
, "w");
2606 return error("cannot open %s: %s", namebuf
, strerror(errno
));
2608 /* Normal git tools never deal with .rej, so do not pretend
2609 * this is a git patch by saying --git nor give extended
2610 * headers. While at it, maybe please "kompare" that wants
2611 * the trailing TAB and some garbage at the end of line ;-).
2613 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
2614 patch
->new_name
, patch
->new_name
);
2615 for (cnt
= 1, frag
= patch
->fragments
;
2617 cnt
++, frag
= frag
->next
) {
2618 if (!frag
->rejected
) {
2619 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
2622 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
2623 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
2624 if (frag
->patch
[frag
->size
-1] != '\n')
2631 static int write_out_results(struct patch
*list
, int skipped_patch
)
2637 if (!list
&& !skipped_patch
)
2638 return error("No changes");
2640 for (phase
= 0; phase
< 2; phase
++) {
2646 write_out_one_result(l
, phase
);
2647 if (phase
== 1 && write_out_one_reject(l
))
2656 static struct lock_file lock_file
;
2658 static struct excludes
{
2659 struct excludes
*next
;
2663 static int use_patch(struct patch
*p
)
2665 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2666 struct excludes
*x
= excludes
;
2668 if (fnmatch(x
->path
, pathname
, 0) == 0)
2672 if (0 < prefix_length
) {
2673 int pathlen
= strlen(pathname
);
2674 if (pathlen
<= prefix_length
||
2675 memcmp(prefix
, pathname
, prefix_length
))
2681 static void prefix_one(char **name
)
2683 char *old_name
= *name
;
2686 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
2690 static void prefix_patches(struct patch
*p
)
2692 if (!prefix
|| p
->is_toplevel_relative
)
2694 for ( ; p
; p
= p
->next
) {
2695 if (p
->new_name
== p
->old_name
) {
2696 char *prefixed
= p
->new_name
;
2697 prefix_one(&prefixed
);
2698 p
->new_name
= p
->old_name
= prefixed
;
2701 prefix_one(&p
->new_name
);
2702 prefix_one(&p
->old_name
);
2707 static int apply_patch(int fd
, const char *filename
, int inaccurate_eof
)
2709 unsigned long offset
, size
;
2710 char *buffer
= read_patch_file(fd
, &size
);
2711 struct patch
*list
= NULL
, **listp
= &list
;
2712 int skipped_patch
= 0;
2714 patch_input_file
= filename
;
2719 struct patch
*patch
;
2722 patch
= xcalloc(1, sizeof(*patch
));
2723 patch
->inaccurate_eof
= inaccurate_eof
;
2724 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
2727 if (apply_in_reverse
)
2728 reverse_patches(patch
);
2730 prefix_patches(patch
);
2731 if (use_patch(patch
)) {
2734 listp
= &patch
->next
;
2737 /* perhaps free it a bit better? */
2745 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
2748 update_index
= check_index
&& apply
;
2749 if (update_index
&& newfd
< 0)
2750 newfd
= hold_locked_index(&lock_file
, 1);
2753 if (read_cache() < 0)
2754 die("unable to read index file");
2757 if ((check
|| apply
) &&
2758 check_patch_list(list
) < 0 &&
2762 if (apply
&& write_out_results(list
, skipped_patch
))
2765 if (show_index_info
)
2766 show_index_list(list
);
2769 stat_patch_list(list
);
2772 numstat_patch_list(list
);
2775 summary_patch_list(list
);
2781 static int git_apply_config(const char *var
, const char *value
)
2783 if (!strcmp(var
, "apply.whitespace")) {
2784 apply_default_whitespace
= xstrdup(value
);
2787 return git_default_config(var
, value
);
2791 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
2795 int inaccurate_eof
= 0;
2797 int is_not_gitdir
= 0;
2799 const char *whitespace_option
= NULL
;
2801 prefix
= setup_git_directory_gently(&is_not_gitdir
);
2802 prefix_length
= prefix
? strlen(prefix
) : 0;
2803 git_config(git_apply_config
);
2804 if (apply_default_whitespace
)
2805 parse_whitespace_option(apply_default_whitespace
);
2807 for (i
= 1; i
< argc
; i
++) {
2808 const char *arg
= argv
[i
];
2812 if (!strcmp(arg
, "-")) {
2813 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2817 if (!prefixcmp(arg
, "--exclude=")) {
2818 struct excludes
*x
= xmalloc(sizeof(*x
));
2824 if (!prefixcmp(arg
, "-p")) {
2825 p_value
= atoi(arg
+ 2);
2829 if (!strcmp(arg
, "--no-add")) {
2833 if (!strcmp(arg
, "--stat")) {
2838 if (!strcmp(arg
, "--allow-binary-replacement") ||
2839 !strcmp(arg
, "--binary")) {
2840 continue; /* now no-op */
2842 if (!strcmp(arg
, "--numstat")) {
2847 if (!strcmp(arg
, "--summary")) {
2852 if (!strcmp(arg
, "--check")) {
2857 if (!strcmp(arg
, "--index")) {
2859 die("--index outside a repository");
2863 if (!strcmp(arg
, "--cached")) {
2865 die("--cached outside a repository");
2870 if (!strcmp(arg
, "--apply")) {
2874 if (!strcmp(arg
, "--index-info")) {
2876 show_index_info
= 1;
2879 if (!strcmp(arg
, "-z")) {
2880 line_termination
= 0;
2883 if (!prefixcmp(arg
, "-C")) {
2884 p_context
= strtoul(arg
+ 2, &end
, 0);
2886 die("unrecognized context count '%s'", arg
+ 2);
2889 if (!prefixcmp(arg
, "--whitespace=")) {
2890 whitespace_option
= arg
+ 13;
2891 parse_whitespace_option(arg
+ 13);
2894 if (!strcmp(arg
, "-R") || !strcmp(arg
, "--reverse")) {
2895 apply_in_reverse
= 1;
2898 if (!strcmp(arg
, "--unidiff-zero")) {
2902 if (!strcmp(arg
, "--reject")) {
2903 apply
= apply_with_reject
= apply_verbosely
= 1;
2906 if (!strcmp(arg
, "-v") || !strcmp(arg
, "--verbose")) {
2907 apply_verbosely
= 1;
2910 if (!strcmp(arg
, "--inaccurate-eof")) {
2914 if (0 < prefix_length
)
2915 arg
= prefix_filename(prefix
, prefix_length
, arg
);
2917 fd
= open(arg
, O_RDONLY
);
2921 set_default_whitespace_mode(whitespace_option
);
2922 errs
|= apply_patch(fd
, arg
, inaccurate_eof
);
2925 set_default_whitespace_mode(whitespace_option
);
2927 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2928 if (whitespace_error
) {
2929 if (squelch_whitespace_errors
&&
2930 squelch_whitespace_errors
< whitespace_error
) {
2932 whitespace_error
- squelch_whitespace_errors
;
2933 fprintf(stderr
, "warning: squelched %d "
2934 "whitespace error%s\n",
2936 squelched
== 1 ? "" : "s");
2938 if (new_whitespace
== error_on_whitespace
)
2939 die("%d line%s add%s whitespace errors.",
2941 whitespace_error
== 1 ? "" : "s",
2942 whitespace_error
== 1 ? "s" : "");
2943 if (applied_after_fixing_ws
)
2944 fprintf(stderr
, "warning: %d line%s applied after"
2945 " fixing whitespace errors.\n",
2946 applied_after_fixing_ws
,
2947 applied_after_fixing_ws
== 1 ? "" : "s");
2948 else if (whitespace_error
)
2949 fprintf(stderr
, "warning: %d line%s add%s whitespace errors.\n",
2951 whitespace_error
== 1 ? "" : "s",
2952 whitespace_error
== 1 ? "s" : "");
2956 if (write_cache(newfd
, active_cache
, active_nr
) ||
2957 close(newfd
) || commit_locked_index(&lock_file
))
2958 die("Unable to write new index file");