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 const char *fake_ancestor
;
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|fix|error|error-all>] <patch>...";
50 static enum ws_error_action
{
55 } ws_error_action
= warn_on_ws_error
;
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 ws_error_action
= warn_on_ws_error
;
67 if (!strcmp(option
, "warn")) {
68 ws_error_action
= warn_on_ws_error
;
71 if (!strcmp(option
, "nowarn")) {
72 ws_error_action
= nowarn_ws_error
;
75 if (!strcmp(option
, "error")) {
76 ws_error_action
= die_on_ws_error
;
79 if (!strcmp(option
, "error-all")) {
80 ws_error_action
= die_on_ws_error
;
81 squelch_whitespace_errors
= 0;
84 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
85 ws_error_action
= correct_ws_error
;
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 ws_error_action
= (apply
? warn_on_ws_error
: nowarn_ws_error
);
98 * For "diff-stat" like behaviour, we keep track of the biggest change
99 * we've seen, and the longest filename. That allows us to do simple
102 static int max_change
, max_len
;
105 * Various "current state", notably line numbers and what
106 * file (and how) we're patching right now.. The "is_xxxx"
107 * things are flags, where -1 means "don't know yet".
109 static int linenr
= 1;
112 * This represents one "hunk" from a patch, starting with
113 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
114 * patch text is pointed at by patch, and its byte length
115 * is stored in size. leading and trailing are the number
119 unsigned long leading
, trailing
;
120 unsigned long oldpos
, oldlines
;
121 unsigned long newpos
, newlines
;
125 struct fragment
*next
;
129 * When dealing with a binary patch, we reuse "leading" field
130 * to store the type of the binary hunk, either deflated "delta"
131 * or deflated "literal".
133 #define binary_patch_method leading
134 #define BINARY_DELTA_DEFLATED 1
135 #define BINARY_LITERAL_DEFLATED 2
138 * This represents a "patch" to a file, both metainfo changes
139 * such as creation/deletion, filemode and content changes represented
140 * as a series of fragments.
143 char *new_name
, *old_name
, *def_name
;
144 unsigned int old_mode
, new_mode
;
145 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
148 unsigned long deflate_origlen
;
149 int lines_added
, lines_deleted
;
151 unsigned int is_toplevel_relative
:1;
152 unsigned int inaccurate_eof
:1;
153 unsigned int is_binary
:1;
154 unsigned int is_copy
:1;
155 unsigned int is_rename
:1;
156 struct fragment
*fragments
;
159 char old_sha1_prefix
[41];
160 char new_sha1_prefix
[41];
164 static void say_patch_name(FILE *output
, const char *pre
,
165 struct patch
*patch
, const char *post
)
168 if (patch
->old_name
&& patch
->new_name
&&
169 strcmp(patch
->old_name
, patch
->new_name
)) {
170 quote_c_style(patch
->old_name
, NULL
, output
, 0);
171 fputs(" => ", output
);
172 quote_c_style(patch
->new_name
, NULL
, output
, 0);
174 const char *n
= patch
->new_name
;
177 quote_c_style(n
, NULL
, output
, 0);
182 #define CHUNKSIZE (8192)
185 static void read_patch_file(struct strbuf
*sb
, int fd
)
187 if (strbuf_read(sb
, fd
, 0) < 0)
188 die("git-apply: read returned %s", strerror(errno
));
191 * Make sure that we have some slop in the buffer
192 * so that we can do speculative "memcmp" etc, and
193 * see to it that it is NUL-filled.
195 strbuf_grow(sb
, SLOP
);
196 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
199 static unsigned long linelen(const char *buffer
, unsigned long size
)
201 unsigned long len
= 0;
204 if (*buffer
++ == '\n')
210 static int is_dev_null(const char *str
)
212 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
218 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
220 if (c
== ' ' && !(terminate
& TERM_SPACE
))
222 if (c
== '\t' && !(terminate
& TERM_TAB
))
228 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
231 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 strbuf_init(&name
, 0);
241 if (!unquote_c_style(&name
, line
, NULL
)) {
244 for (cp
= name
.buf
; p_value
; p_value
--) {
245 cp
= strchr(cp
, '/');
251 /* name can later be freed, so we need
252 * to memmove, not just return cp
254 strbuf_remove(&name
, 0, cp
- name
.buf
);
256 return strbuf_detach(&name
, NULL
);
259 strbuf_release(&name
);
268 if (name_terminate(start
, line
-start
, c
, terminate
))
272 if (c
== '/' && !--p_value
)
282 * Generally we prefer the shorter name, especially
283 * if the other one is just a variation of that with
284 * something else tacked on to the end (ie "file.orig"
288 int deflen
= strlen(def
);
289 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
294 return xmemdupz(start
, len
);
297 static int count_slashes(const char *cp
)
309 * Given the string after "--- " or "+++ ", guess the appropriate
310 * p_value for the given patch.
312 static int guess_p_value(const char *nameline
)
317 if (is_dev_null(nameline
))
319 name
= find_name(nameline
, NULL
, 0, TERM_SPACE
| TERM_TAB
);
322 cp
= strchr(name
, '/');
327 * Does it begin with "a/$our-prefix" and such? Then this is
328 * very likely to apply to our directory.
330 if (!strncmp(name
, prefix
, prefix_length
))
331 val
= count_slashes(prefix
);
334 if (!strncmp(cp
, prefix
, prefix_length
))
335 val
= count_slashes(prefix
) + 1;
343 * Get the name etc info from the --/+++ lines of a traditional patch header
345 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
346 * files, we can happily check the index for a match, but for creating a
347 * new file we should try to match whatever "patch" does. I have no idea.
349 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
353 first
+= 4; /* skip "--- " */
354 second
+= 4; /* skip "+++ " */
355 if (!p_value_known
) {
357 p
= guess_p_value(first
);
358 q
= guess_p_value(second
);
360 if (0 <= p
&& p
== q
) {
365 if (is_dev_null(first
)) {
367 patch
->is_delete
= 0;
368 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
369 patch
->new_name
= name
;
370 } else if (is_dev_null(second
)) {
372 patch
->is_delete
= 1;
373 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
374 patch
->old_name
= name
;
376 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
377 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
378 patch
->old_name
= patch
->new_name
= name
;
381 die("unable to find filename in patch at line %d", linenr
);
384 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
390 * We're anal about diff header consistency, to make
391 * sure that we don't end up having strange ambiguous
392 * patches floating around.
394 * As a result, gitdiff_{old|new}name() will check
395 * their names against any previous information, just
398 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
400 if (!orig_name
&& !isnull
)
401 return find_name(line
, NULL
, p_value
, TERM_TAB
);
410 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
411 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
412 if (!another
|| memcmp(another
, name
, len
))
413 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
418 /* expect "/dev/null" */
419 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
420 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
425 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
427 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
431 static int gitdiff_newname(const char *line
, struct patch
*patch
)
433 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
437 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
439 patch
->old_mode
= strtoul(line
, NULL
, 8);
443 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
445 patch
->new_mode
= strtoul(line
, NULL
, 8);
449 static int gitdiff_delete(const char *line
, struct patch
*patch
)
451 patch
->is_delete
= 1;
452 patch
->old_name
= patch
->def_name
;
453 return gitdiff_oldmode(line
, patch
);
456 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
459 patch
->new_name
= patch
->def_name
;
460 return gitdiff_newmode(line
, patch
);
463 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
466 patch
->old_name
= find_name(line
, NULL
, 0, 0);
470 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
473 patch
->new_name
= find_name(line
, NULL
, 0, 0);
477 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
479 patch
->is_rename
= 1;
480 patch
->old_name
= find_name(line
, NULL
, 0, 0);
484 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
486 patch
->is_rename
= 1;
487 patch
->new_name
= find_name(line
, NULL
, 0, 0);
491 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
493 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
498 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
500 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
505 static int gitdiff_index(const char *line
, struct patch
*patch
)
508 * index line is N hexadecimal, "..", N hexadecimal,
509 * and optional space with octal mode.
511 const char *ptr
, *eol
;
514 ptr
= strchr(line
, '.');
515 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
518 memcpy(patch
->old_sha1_prefix
, line
, len
);
519 patch
->old_sha1_prefix
[len
] = 0;
522 ptr
= strchr(line
, ' ');
523 eol
= strchr(line
, '\n');
525 if (!ptr
|| eol
< ptr
)
531 memcpy(patch
->new_sha1_prefix
, line
, len
);
532 patch
->new_sha1_prefix
[len
] = 0;
534 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
539 * This is normal for a diff that doesn't change anything: we'll fall through
540 * into the next diff. Tell the parser to break out.
542 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
547 static const char *stop_at_slash(const char *line
, int llen
)
551 for (i
= 0; i
< llen
; i
++) {
560 * This is to extract the same name that appears on "diff --git"
561 * line. We do not find and return anything if it is a rename
562 * patch, and it is OK because we will find the name elsewhere.
563 * We need to reliably find name only when it is mode-change only,
564 * creation or deletion of an empty file. In any of these cases,
565 * both sides are the same name under a/ and b/ respectively.
567 static char *git_header_name(char *line
, int llen
)
570 const char *second
= NULL
;
573 line
+= strlen("diff --git ");
574 llen
-= strlen("diff --git ");
581 strbuf_init(&first
, 0);
584 if (unquote_c_style(&first
, line
, &second
))
587 /* advance to the first slash */
588 cp
= stop_at_slash(first
.buf
, first
.len
);
589 /* we do not accept absolute paths */
590 if (!cp
|| cp
== first
.buf
)
592 strbuf_remove(&first
, 0, cp
+ 1 - first
.buf
);
595 * second points at one past closing dq of name.
596 * find the second name.
598 while ((second
< line
+ llen
) && isspace(*second
))
601 if (line
+ llen
<= second
)
603 if (*second
== '"') {
604 if (unquote_c_style(&sp
, second
, NULL
))
606 cp
= stop_at_slash(sp
.buf
, sp
.len
);
607 if (!cp
|| cp
== sp
.buf
)
609 /* They must match, otherwise ignore */
610 if (strcmp(cp
+ 1, first
.buf
))
613 return strbuf_detach(&first
, NULL
);
616 /* unquoted second */
617 cp
= stop_at_slash(second
, line
+ llen
- second
);
618 if (!cp
|| cp
== second
)
621 if (line
+ llen
- cp
!= first
.len
+ 1 ||
622 memcmp(first
.buf
, cp
, first
.len
))
624 return strbuf_detach(&first
, NULL
);
627 strbuf_release(&first
);
632 /* unquoted first name */
633 name
= stop_at_slash(line
, llen
);
634 if (!name
|| name
== line
)
639 * since the first name is unquoted, a dq if exists must be
640 * the beginning of the second name.
642 for (second
= name
; second
< line
+ llen
; second
++) {
643 if (*second
== '"') {
648 if (unquote_c_style(&sp
, second
, NULL
))
651 np
= stop_at_slash(sp
.buf
, sp
.len
);
652 if (!np
|| np
== sp
.buf
)
656 len
= sp
.buf
+ sp
.len
- np
;
657 if (len
< second
- name
&&
658 !strncmp(np
, name
, len
) &&
659 isspace(name
[len
])) {
661 strbuf_remove(&sp
, 0, np
- sp
.buf
);
662 return strbuf_detach(&sp
, NULL
);
672 * Accept a name only if it shows up twice, exactly the same
675 for (len
= 0 ; ; len
++) {
690 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
691 return xmemdupz(name
, len
);
697 /* Verify that we recognize the lines following a git header */
698 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
700 unsigned long offset
;
702 /* A git diff has explicit new/delete information, so we don't guess */
704 patch
->is_delete
= 0;
707 * Some things may not have the old name in the
708 * rest of the headers anywhere (pure mode changes,
709 * or removing or adding empty files), so we get
710 * the default name from the header.
712 patch
->def_name
= git_header_name(line
, len
);
717 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
718 static const struct opentry
{
720 int (*fn
)(const char *, struct patch
*);
722 { "@@ -", gitdiff_hdrend
},
723 { "--- ", gitdiff_oldname
},
724 { "+++ ", gitdiff_newname
},
725 { "old mode ", gitdiff_oldmode
},
726 { "new mode ", gitdiff_newmode
},
727 { "deleted file mode ", gitdiff_delete
},
728 { "new file mode ", gitdiff_newfile
},
729 { "copy from ", gitdiff_copysrc
},
730 { "copy to ", gitdiff_copydst
},
731 { "rename old ", gitdiff_renamesrc
},
732 { "rename new ", gitdiff_renamedst
},
733 { "rename from ", gitdiff_renamesrc
},
734 { "rename to ", gitdiff_renamedst
},
735 { "similarity index ", gitdiff_similarity
},
736 { "dissimilarity index ", gitdiff_dissimilarity
},
737 { "index ", gitdiff_index
},
738 { "", gitdiff_unrecognized
},
742 len
= linelen(line
, size
);
743 if (!len
|| line
[len
-1] != '\n')
745 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
746 const struct opentry
*p
= optable
+ i
;
747 int oplen
= strlen(p
->str
);
748 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
750 if (p
->fn(line
+ oplen
, patch
) < 0)
759 static int parse_num(const char *line
, unsigned long *p
)
765 *p
= strtoul(line
, &ptr
, 10);
769 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
770 unsigned long *p1
, unsigned long *p2
)
774 if (offset
< 0 || offset
>= len
)
779 digits
= parse_num(line
, p1
);
789 digits
= parse_num(line
+1, p2
);
801 if (memcmp(line
, expect
, ex
))
808 * Parse a unified diff fragment header of the
809 * form "@@ -a,b +c,d @@"
811 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
815 if (!len
|| line
[len
-1] != '\n')
818 /* Figure out the number of lines in a fragment */
819 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
820 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
825 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
827 unsigned long offset
, len
;
829 patch
->is_toplevel_relative
= 0;
830 patch
->is_rename
= patch
->is_copy
= 0;
831 patch
->is_new
= patch
->is_delete
= -1;
832 patch
->old_mode
= patch
->new_mode
= 0;
833 patch
->old_name
= patch
->new_name
= NULL
;
834 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
835 unsigned long nextlen
;
837 len
= linelen(line
, size
);
841 /* Testing this early allows us to take a few shortcuts.. */
846 * Make sure we don't find any unconnected patch fragments.
847 * That's a sign that we didn't find a header, and that a
848 * patch has become corrupted/broken up.
850 if (!memcmp("@@ -", line
, 4)) {
851 struct fragment dummy
;
852 if (parse_fragment_header(line
, len
, &dummy
) < 0)
854 die("patch fragment without header at line %d: %.*s",
855 linenr
, (int)len
-1, line
);
862 * Git patch? It might not have a real patch, just a rename
863 * or mode change, so we handle that specially
865 if (!memcmp("diff --git ", line
, 11)) {
866 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
867 if (git_hdr_len
<= len
)
869 if (!patch
->old_name
&& !patch
->new_name
) {
870 if (!patch
->def_name
)
871 die("git diff header lacks filename information (line %d)", linenr
);
872 patch
->old_name
= patch
->new_name
= patch
->def_name
;
874 patch
->is_toplevel_relative
= 1;
875 *hdrsize
= git_hdr_len
;
879 /* --- followed by +++ ? */
880 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
884 * We only accept unified patches, so we want it to
885 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
886 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
888 nextlen
= linelen(line
+ len
, size
- len
);
889 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
892 /* Ok, we'll consider it a patch */
893 parse_traditional_patch(line
, line
+len
, patch
);
894 *hdrsize
= len
+ nextlen
;
901 static void check_whitespace(const char *line
, int len
, unsigned ws_rule
)
904 unsigned result
= check_and_emit_line(line
+ 1, len
- 1, ws_rule
,
905 NULL
, NULL
, NULL
, NULL
);
910 if (squelch_whitespace_errors
&&
911 squelch_whitespace_errors
< whitespace_error
)
914 err
= whitespace_error_string(result
);
915 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
916 patch_input_file
, linenr
, err
, len
- 2, line
+ 1);
922 * Parse a unified diff. Note that this really needs to parse each
923 * fragment separately, since the only way to know the difference
924 * between a "---" that is part of a patch, and a "---" that starts
925 * the next patch is to look at the line counts..
927 static int parse_fragment(char *line
, unsigned long size
,
928 struct patch
*patch
, struct fragment
*fragment
)
931 int len
= linelen(line
, size
), offset
;
932 unsigned long oldlines
, newlines
;
933 unsigned long leading
, trailing
;
935 offset
= parse_fragment_header(line
, len
, fragment
);
938 oldlines
= fragment
->oldlines
;
939 newlines
= fragment
->newlines
;
943 /* Parse the thing.. */
950 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
951 if (!oldlines
&& !newlines
)
953 len
= linelen(line
, size
);
954 if (!len
|| line
[len
-1] != '\n')
959 case '\n': /* newer GNU diff, an empty context line */
963 if (!deleted
&& !added
)
968 if (apply_in_reverse
&&
969 ws_error_action
!= nowarn_ws_error
)
970 check_whitespace(line
, len
, patch
->ws_rule
);
976 if (!apply_in_reverse
&&
977 ws_error_action
!= nowarn_ws_error
)
978 check_whitespace(line
, len
, patch
->ws_rule
);
985 * We allow "\ No newline at end of file". Depending
986 * on locale settings when the patch was produced we
987 * don't know what this line looks like. The only
988 * thing we do know is that it begins with "\ ".
989 * Checking for 12 is just for sanity check -- any
990 * l10n of "\ No newline..." is at least that long.
993 if (len
< 12 || memcmp(line
, "\\ ", 2))
998 if (oldlines
|| newlines
)
1000 fragment
->leading
= leading
;
1001 fragment
->trailing
= trailing
;
1004 * If a fragment ends with an incomplete line, we failed to include
1005 * it in the above loop because we hit oldlines == newlines == 0
1008 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1009 offset
+= linelen(line
, size
);
1011 patch
->lines_added
+= added
;
1012 patch
->lines_deleted
+= deleted
;
1014 if (0 < patch
->is_new
&& oldlines
)
1015 return error("new file depends on old contents");
1016 if (0 < patch
->is_delete
&& newlines
)
1017 return error("deleted file still has contents");
1021 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
1023 unsigned long offset
= 0;
1024 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1025 struct fragment
**fragp
= &patch
->fragments
;
1027 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1028 struct fragment
*fragment
;
1031 fragment
= xcalloc(1, sizeof(*fragment
));
1032 len
= parse_fragment(line
, size
, patch
, fragment
);
1034 die("corrupt patch at line %d", linenr
);
1035 fragment
->patch
= line
;
1036 fragment
->size
= len
;
1037 oldlines
+= fragment
->oldlines
;
1038 newlines
+= fragment
->newlines
;
1039 context
+= fragment
->leading
+ fragment
->trailing
;
1042 fragp
= &fragment
->next
;
1050 * If something was removed (i.e. we have old-lines) it cannot
1051 * be creation, and if something was added it cannot be
1052 * deletion. However, the reverse is not true; --unified=0
1053 * patches that only add are not necessarily creation even
1054 * though they do not have any old lines, and ones that only
1055 * delete are not necessarily deletion.
1057 * Unfortunately, a real creation/deletion patch do _not_ have
1058 * any context line by definition, so we cannot safely tell it
1059 * apart with --unified=0 insanity. At least if the patch has
1060 * more than one hunk it is not creation or deletion.
1062 if (patch
->is_new
< 0 &&
1063 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1065 if (patch
->is_delete
< 0 &&
1066 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1067 patch
->is_delete
= 0;
1068 if (!unidiff_zero
|| context
) {
1069 /* If the user says the patch is not generated with
1070 * --unified=0, or if we have seen context lines,
1071 * then not having oldlines means the patch is creation,
1072 * and not having newlines means the patch is deletion.
1074 if (patch
->is_new
< 0 && !oldlines
) {
1076 patch
->old_name
= NULL
;
1078 if (patch
->is_delete
< 0 && !newlines
) {
1079 patch
->is_delete
= 1;
1080 patch
->new_name
= NULL
;
1084 if (0 < patch
->is_new
&& oldlines
)
1085 die("new file %s depends on old contents", patch
->new_name
);
1086 if (0 < patch
->is_delete
&& newlines
)
1087 die("deleted file %s still has contents", patch
->old_name
);
1088 if (!patch
->is_delete
&& !newlines
&& context
)
1089 fprintf(stderr
, "** warning: file %s becomes empty but "
1090 "is not deleted\n", patch
->new_name
);
1095 static inline int metadata_changes(struct patch
*patch
)
1097 return patch
->is_rename
> 0 ||
1098 patch
->is_copy
> 0 ||
1099 patch
->is_new
> 0 ||
1101 (patch
->old_mode
&& patch
->new_mode
&&
1102 patch
->old_mode
!= patch
->new_mode
);
1105 static char *inflate_it(const void *data
, unsigned long size
,
1106 unsigned long inflated_size
)
1112 memset(&stream
, 0, sizeof(stream
));
1114 stream
.next_in
= (unsigned char *)data
;
1115 stream
.avail_in
= size
;
1116 stream
.next_out
= out
= xmalloc(inflated_size
);
1117 stream
.avail_out
= inflated_size
;
1118 inflateInit(&stream
);
1119 st
= inflate(&stream
, Z_FINISH
);
1120 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1127 static struct fragment
*parse_binary_hunk(char **buf_p
,
1128 unsigned long *sz_p
,
1133 * Expect a line that begins with binary patch method ("literal"
1134 * or "delta"), followed by the length of data before deflating.
1135 * a sequence of 'length-byte' followed by base-85 encoded data
1136 * should follow, terminated by a newline.
1138 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1139 * and we would limit the patch line to 66 characters,
1140 * so one line can fit up to 13 groups that would decode
1141 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1142 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1145 unsigned long size
= *sz_p
;
1146 char *buffer
= *buf_p
;
1148 unsigned long origlen
;
1151 struct fragment
*frag
;
1153 llen
= linelen(buffer
, size
);
1158 if (!prefixcmp(buffer
, "delta ")) {
1159 patch_method
= BINARY_DELTA_DEFLATED
;
1160 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1162 else if (!prefixcmp(buffer
, "literal ")) {
1163 patch_method
= BINARY_LITERAL_DEFLATED
;
1164 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1172 int byte_length
, max_byte_length
, newsize
;
1173 llen
= linelen(buffer
, size
);
1177 /* consume the blank line */
1183 * Minimum line is "A00000\n" which is 7-byte long,
1184 * and the line length must be multiple of 5 plus 2.
1186 if ((llen
< 7) || (llen
-2) % 5)
1188 max_byte_length
= (llen
- 2) / 5 * 4;
1189 byte_length
= *buffer
;
1190 if ('A' <= byte_length
&& byte_length
<= 'Z')
1191 byte_length
= byte_length
- 'A' + 1;
1192 else if ('a' <= byte_length
&& byte_length
<= 'z')
1193 byte_length
= byte_length
- 'a' + 27;
1196 /* if the input length was not multiple of 4, we would
1197 * have filler at the end but the filler should never
1200 if (max_byte_length
< byte_length
||
1201 byte_length
<= max_byte_length
- 4)
1203 newsize
= hunk_size
+ byte_length
;
1204 data
= xrealloc(data
, newsize
);
1205 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1207 hunk_size
= newsize
;
1212 frag
= xcalloc(1, sizeof(*frag
));
1213 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1217 frag
->size
= origlen
;
1221 frag
->binary_patch_method
= patch_method
;
1227 error("corrupt binary patch at line %d: %.*s",
1228 linenr
-1, llen
-1, buffer
);
1232 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1235 * We have read "GIT binary patch\n"; what follows is a line
1236 * that says the patch method (currently, either "literal" or
1237 * "delta") and the length of data before deflating; a
1238 * sequence of 'length-byte' followed by base-85 encoded data
1241 * When a binary patch is reversible, there is another binary
1242 * hunk in the same format, starting with patch method (either
1243 * "literal" or "delta") with the length of data, and a sequence
1244 * of length-byte + base-85 encoded data, terminated with another
1245 * empty line. This data, when applied to the postimage, produces
1248 struct fragment
*forward
;
1249 struct fragment
*reverse
;
1253 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1254 if (!forward
&& !status
)
1255 /* there has to be one hunk (forward hunk) */
1256 return error("unrecognized binary patch at line %d", linenr
-1);
1258 /* otherwise we already gave an error message */
1261 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1266 * Not having reverse hunk is not an error, but having
1267 * a corrupt reverse hunk is.
1269 free((void*) forward
->patch
);
1273 forward
->next
= reverse
;
1274 patch
->fragments
= forward
;
1275 patch
->is_binary
= 1;
1279 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1281 int hdrsize
, patchsize
;
1282 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1287 patch
->ws_rule
= whitespace_rule(patch
->new_name
1291 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1292 size
- offset
- hdrsize
, patch
);
1295 static const char *binhdr
[] = {
1300 static const char git_binary
[] = "GIT binary patch\n";
1302 int hd
= hdrsize
+ offset
;
1303 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1305 if (llen
== sizeof(git_binary
) - 1 &&
1306 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1309 used
= parse_binary(buffer
+ hd
+ llen
,
1310 size
- hd
- llen
, patch
);
1312 patchsize
= used
+ llen
;
1316 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1317 for (i
= 0; binhdr
[i
]; i
++) {
1318 int len
= strlen(binhdr
[i
]);
1319 if (len
< size
- hd
&&
1320 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1322 patch
->is_binary
= 1;
1329 /* Empty patch cannot be applied if it is a text patch
1330 * without metadata change. A binary patch appears
1333 if ((apply
|| check
) &&
1334 (!patch
->is_binary
&& !metadata_changes(patch
)))
1335 die("patch with only garbage at line %d", linenr
);
1338 return offset
+ hdrsize
+ patchsize
;
1341 #define swap(a,b) myswap((a),(b),sizeof(a))
1343 #define myswap(a, b, size) do { \
1344 unsigned char mytmp[size]; \
1345 memcpy(mytmp, &a, size); \
1346 memcpy(&a, &b, size); \
1347 memcpy(&b, mytmp, size); \
1350 static void reverse_patches(struct patch
*p
)
1352 for (; p
; p
= p
->next
) {
1353 struct fragment
*frag
= p
->fragments
;
1355 swap(p
->new_name
, p
->old_name
);
1356 swap(p
->new_mode
, p
->old_mode
);
1357 swap(p
->is_new
, p
->is_delete
);
1358 swap(p
->lines_added
, p
->lines_deleted
);
1359 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1361 for (; frag
; frag
= frag
->next
) {
1362 swap(frag
->newpos
, frag
->oldpos
);
1363 swap(frag
->newlines
, frag
->oldlines
);
1368 static const char pluses
[] =
1369 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1370 static const char minuses
[]=
1371 "----------------------------------------------------------------------";
1373 static void show_stats(struct patch
*patch
)
1375 struct strbuf qname
;
1376 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1379 strbuf_init(&qname
, 0);
1380 quote_c_style(cp
, &qname
, NULL
, 0);
1383 * "scale" the filename
1389 if (qname
.len
> max
) {
1390 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
1392 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
1393 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
1396 if (patch
->is_binary
) {
1397 printf(" %-*s | Bin\n", max
, qname
.buf
);
1398 strbuf_release(&qname
);
1402 printf(" %-*s |", max
, qname
.buf
);
1403 strbuf_release(&qname
);
1406 * scale the add/delete
1408 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
1409 add
= patch
->lines_added
;
1410 del
= patch
->lines_deleted
;
1412 if (max_change
> 0) {
1413 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
1414 add
= (add
* max
+ max_change
/ 2) / max_change
;
1417 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
1418 add
, pluses
, del
, minuses
);
1421 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
1423 switch (st
->st_mode
& S_IFMT
) {
1425 strbuf_grow(buf
, st
->st_size
);
1426 if (readlink(path
, buf
->buf
, st
->st_size
) != st
->st_size
)
1428 strbuf_setlen(buf
, st
->st_size
);
1431 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
1432 return error("unable to open or read %s", path
);
1433 convert_to_git(path
, buf
->buf
, buf
->len
, buf
);
1440 static int find_offset(const char *buf
, unsigned long size
,
1441 const char *fragment
, unsigned long fragsize
,
1442 int line
, int *lines
)
1445 unsigned long start
, backwards
, forwards
;
1447 if (fragsize
> size
)
1452 unsigned long offset
= 0;
1454 while (offset
+ fragsize
<= size
) {
1455 if (buf
[offset
++] == '\n') {
1463 /* Exact line number? */
1464 if ((start
+ fragsize
<= size
) &&
1465 !memcmp(buf
+ start
, fragment
, fragsize
))
1469 * There's probably some smart way to do this, but I'll leave
1470 * that to the smart and beautiful people. I'm simple and stupid.
1474 for (i
= 0; ; i
++) {
1481 if (forwards
+ fragsize
> size
)
1487 } while (backwards
&& buf
[backwards
-1] != '\n');
1490 while (forwards
+ fragsize
<= size
) {
1491 if (buf
[forwards
++] == '\n')
1497 if (try + fragsize
> size
)
1499 if (memcmp(buf
+ try, fragment
, fragsize
))
1509 * We should start searching forward and backward.
1514 static void remove_first_line(const char **rbuf
, int *rsize
)
1516 const char *buf
= *rbuf
;
1518 unsigned long offset
;
1520 while (offset
<= size
) {
1521 if (buf
[offset
++] == '\n')
1524 *rsize
= size
- offset
;
1525 *rbuf
= buf
+ offset
;
1528 static void remove_last_line(const char **rbuf
, int *rsize
)
1530 const char *buf
= *rbuf
;
1532 unsigned long offset
;
1534 while (offset
> 0) {
1535 if (buf
[--offset
] == '\n')
1538 *rsize
= offset
+ 1;
1541 static int apply_line(char *output
, const char *patch
, int plen
,
1545 * plen is number of bytes to be copied from patch,
1546 * starting at patch+1 (patch[0] is '+'). Typically
1547 * patch[plen] is '\n', unless this is the incomplete
1551 int add_nl_to_tail
= 0;
1553 int last_tab_in_indent
= 0;
1554 int last_space_in_indent
= 0;
1555 int need_fix_leading_space
= 0;
1558 if ((ws_error_action
!= correct_ws_error
) || !whitespace_error
||
1560 memcpy(output
, patch
+ 1, plen
);
1565 * Strip trailing whitespace
1567 if ((ws_rule
& WS_TRAILING_SPACE
) &&
1568 (1 < plen
&& isspace(patch
[plen
-1]))) {
1569 if (patch
[plen
] == '\n')
1572 while (0 < plen
&& isspace(patch
[plen
]))
1578 * Check leading whitespaces (indent)
1580 for (i
= 1; i
< plen
; i
++) {
1583 last_tab_in_indent
= i
;
1584 if ((ws_rule
& WS_SPACE_BEFORE_TAB
) &&
1585 0 < last_space_in_indent
)
1586 need_fix_leading_space
= 1;
1587 } else if (ch
== ' ') {
1588 last_space_in_indent
= i
;
1589 if ((ws_rule
& WS_INDENT_WITH_NON_TAB
) &&
1590 8 <= i
- last_tab_in_indent
)
1591 need_fix_leading_space
= 1;
1598 if (need_fix_leading_space
) {
1599 int consecutive_spaces
= 0;
1600 int last
= last_tab_in_indent
+ 1;
1602 if (ws_rule
& WS_INDENT_WITH_NON_TAB
) {
1603 /* have "last" point at one past the indent */
1604 if (last_tab_in_indent
< last_space_in_indent
)
1605 last
= last_space_in_indent
+ 1;
1607 last
= last_tab_in_indent
+ 1;
1611 * between patch[1..last], strip the funny spaces,
1612 * updating them to tab as needed.
1614 for (i
= 1; i
< last
; i
++, plen
--) {
1617 consecutive_spaces
= 0;
1620 consecutive_spaces
++;
1621 if (consecutive_spaces
== 8) {
1623 consecutive_spaces
= 0;
1627 while (0 < consecutive_spaces
--)
1635 memcpy(output
, patch
+ i
, plen
);
1637 output
[plen
++] = '\n';
1639 applied_after_fixing_ws
++;
1640 return output
+ plen
- buf
;
1643 static int apply_one_fragment(struct strbuf
*buf
, struct fragment
*frag
,
1644 int inaccurate_eof
, unsigned ws_rule
)
1646 int match_beginning
, match_end
;
1647 const char *patch
= frag
->patch
;
1648 int offset
, size
= frag
->size
;
1649 char *old
= xmalloc(size
);
1650 char *new = xmalloc(size
);
1651 const char *oldlines
, *newlines
;
1652 int oldsize
= 0, newsize
= 0;
1653 int new_blank_lines_at_end
= 0;
1654 unsigned long leading
, trailing
;
1659 int len
= linelen(patch
, size
);
1661 int added_blank_line
= 0;
1667 * "plen" is how much of the line we should use for
1668 * the actual patch data. Normally we just remove the
1669 * first character on the line, but if the line is
1670 * followed by "\ No newline", then we also remove the
1671 * last one (which is the newline, of course).
1674 if (len
< size
&& patch
[len
] == '\\')
1677 if (apply_in_reverse
) {
1680 else if (first
== '+')
1686 /* Newer GNU diff, empty context line */
1688 /* ... followed by '\No newline'; nothing */
1690 old
[oldsize
++] = '\n';
1691 new[newsize
++] = '\n';
1695 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1699 /* Fall-through for ' ' */
1701 if (first
!= '+' || !no_add
) {
1702 int added
= apply_line(new + newsize
, patch
,
1706 added
== 1 && new[newsize
-1] == '\n')
1707 added_blank_line
= 1;
1710 case '@': case '\\':
1711 /* Ignore it, we already handled it */
1714 if (apply_verbosely
)
1715 error("invalid start of line: '%c'", first
);
1718 if (added_blank_line
)
1719 new_blank_lines_at_end
++;
1721 new_blank_lines_at_end
= 0;
1726 if (inaccurate_eof
&&
1727 oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1728 newsize
> 0 && new[newsize
- 1] == '\n') {
1735 leading
= frag
->leading
;
1736 trailing
= frag
->trailing
;
1739 * If we don't have any leading/trailing data in the patch,
1740 * we want it to match at the beginning/end of the file.
1742 * But that would break if the patch is generated with
1743 * --unified=0; sane people wouldn't do that to cause us
1744 * trouble, but we try to please not so sane ones as well.
1747 match_beginning
= (!leading
&& !frag
->oldpos
);
1751 match_beginning
= !leading
&& (frag
->oldpos
== 1);
1752 match_end
= !trailing
;
1758 offset
= find_offset(buf
->buf
, buf
->len
,
1759 oldlines
, oldsize
, pos
, &lines
);
1760 if (match_end
&& offset
+ oldsize
!= buf
->len
)
1762 if (match_beginning
&& offset
)
1765 if (ws_error_action
== correct_ws_error
&&
1766 (buf
->len
- oldsize
- offset
== 0)) /* end of file? */
1767 newsize
-= new_blank_lines_at_end
;
1769 /* Warn if it was necessary to reduce the number
1772 if ((leading
!= frag
->leading
) ||
1773 (trailing
!= frag
->trailing
))
1774 fprintf(stderr
, "Context reduced to (%ld/%ld)"
1775 " to apply fragment at %d\n",
1776 leading
, trailing
, pos
+ lines
);
1778 strbuf_splice(buf
, offset
, oldsize
, newlines
, newsize
);
1783 /* Am I at my context limits? */
1784 if ((leading
<= p_context
) && (trailing
<= p_context
))
1786 if (match_beginning
|| match_end
) {
1787 match_beginning
= match_end
= 0;
1791 * Reduce the number of context lines; reduce both
1792 * leading and trailing if they are equal otherwise
1793 * just reduce the larger context.
1795 if (leading
>= trailing
) {
1796 remove_first_line(&oldlines
, &oldsize
);
1797 remove_first_line(&newlines
, &newsize
);
1801 if (trailing
> leading
) {
1802 remove_last_line(&oldlines
, &oldsize
);
1803 remove_last_line(&newlines
, &newsize
);
1808 if (offset
&& apply_verbosely
)
1809 error("while searching for:\n%.*s", oldsize
, oldlines
);
1816 static int apply_binary_fragment(struct strbuf
*buf
, struct patch
*patch
)
1818 struct fragment
*fragment
= patch
->fragments
;
1822 /* Binary patch is irreversible without the optional second hunk */
1823 if (apply_in_reverse
) {
1824 if (!fragment
->next
)
1825 return error("cannot reverse-apply a binary patch "
1826 "without the reverse hunk to '%s'",
1828 ? patch
->new_name
: patch
->old_name
);
1829 fragment
= fragment
->next
;
1831 switch (fragment
->binary_patch_method
) {
1832 case BINARY_DELTA_DEFLATED
:
1833 dst
= patch_delta(buf
->buf
, buf
->len
, fragment
->patch
,
1834 fragment
->size
, &len
);
1837 /* XXX patch_delta NUL-terminates */
1838 strbuf_attach(buf
, dst
, len
, len
+ 1);
1840 case BINARY_LITERAL_DEFLATED
:
1842 strbuf_add(buf
, fragment
->patch
, fragment
->size
);
1848 static int apply_binary(struct strbuf
*buf
, struct patch
*patch
)
1850 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1851 unsigned char sha1
[20];
1854 * For safety, we require patch index line to contain
1855 * full 40-byte textual SHA1 for old and new, at least for now.
1857 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1858 strlen(patch
->new_sha1_prefix
) != 40 ||
1859 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1860 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1861 return error("cannot apply binary patch to '%s' "
1862 "without full index line", name
);
1864 if (patch
->old_name
) {
1866 * See if the old one matches what the patch
1869 hash_sha1_file(buf
->buf
, buf
->len
, blob_type
, sha1
);
1870 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1871 return error("the patch applies to '%s' (%s), "
1872 "which does not match the "
1873 "current contents.",
1874 name
, sha1_to_hex(sha1
));
1877 /* Otherwise, the old one must be empty. */
1879 return error("the patch applies to an empty "
1880 "'%s' but it is not empty", name
);
1883 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1884 if (is_null_sha1(sha1
)) {
1885 strbuf_release(buf
);
1886 return 0; /* deletion patch */
1889 if (has_sha1_file(sha1
)) {
1890 /* We already have the postimage */
1891 enum object_type type
;
1895 result
= read_sha1_file(sha1
, &type
, &size
);
1897 return error("the necessary postimage %s for "
1898 "'%s' cannot be read",
1899 patch
->new_sha1_prefix
, name
);
1900 /* XXX read_sha1_file NUL-terminates */
1901 strbuf_attach(buf
, result
, size
, size
+ 1);
1904 * We have verified buf matches the preimage;
1905 * apply the patch data to it, which is stored
1906 * in the patch->fragments->{patch,size}.
1908 if (apply_binary_fragment(buf
, patch
))
1909 return error("binary patch does not apply to '%s'",
1912 /* verify that the result matches */
1913 hash_sha1_file(buf
->buf
, buf
->len
, blob_type
, sha1
);
1914 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
1915 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
1916 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
1922 static int apply_fragments(struct strbuf
*buf
, struct patch
*patch
)
1924 struct fragment
*frag
= patch
->fragments
;
1925 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1926 unsigned ws_rule
= patch
->ws_rule
;
1927 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
1929 if (patch
->is_binary
)
1930 return apply_binary(buf
, patch
);
1933 if (apply_one_fragment(buf
, frag
, inaccurate_eof
, ws_rule
)) {
1934 error("patch failed: %s:%ld", name
, frag
->oldpos
);
1935 if (!apply_with_reject
)
1944 static int read_file_or_gitlink(struct cache_entry
*ce
, struct strbuf
*buf
)
1949 if (S_ISGITLINK(ce
->ce_mode
)) {
1950 strbuf_grow(buf
, 100);
1951 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
1953 enum object_type type
;
1957 result
= read_sha1_file(ce
->sha1
, &type
, &sz
);
1960 /* XXX read_sha1_file NUL-terminates */
1961 strbuf_attach(buf
, result
, sz
, sz
+ 1);
1966 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
1970 strbuf_init(&buf
, 0);
1972 if (read_file_or_gitlink(ce
, &buf
))
1973 return error("read of %s failed", patch
->old_name
);
1974 } else if (patch
->old_name
) {
1975 if (S_ISGITLINK(patch
->old_mode
)) {
1977 read_file_or_gitlink(ce
, &buf
);
1980 * There is no way to apply subproject
1981 * patch without looking at the index.
1983 patch
->fragments
= NULL
;
1986 if (read_old_data(st
, patch
->old_name
, &buf
))
1987 return error("read of %s failed", patch
->old_name
);
1991 if (apply_fragments(&buf
, patch
) < 0)
1992 return -1; /* note with --reject this succeeds. */
1993 patch
->result
= strbuf_detach(&buf
, &patch
->resultsize
);
1995 if (0 < patch
->is_delete
&& patch
->resultsize
)
1996 return error("removal patch leaves file contents");
2001 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
2004 if (!lstat(new_name
, &nst
)) {
2005 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2008 * A leading component of new_name might be a symlink
2009 * that is going to be removed with this patch, but
2010 * still pointing at somewhere that has the path.
2011 * In such a case, path "new_name" does not exist as
2012 * far as git is concerned.
2014 if (has_symlink_leading_path(new_name
, NULL
))
2017 return error("%s: already exists in working directory", new_name
);
2019 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2020 return error("%s: %s", new_name
, strerror(errno
));
2024 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
2026 if (S_ISGITLINK(ce
->ce_mode
)) {
2027 if (!S_ISDIR(st
->st_mode
))
2031 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
);
2034 static int check_patch(struct patch
*patch
, struct patch
*prev_patch
)
2037 const char *old_name
= patch
->old_name
;
2038 const char *new_name
= patch
->new_name
;
2039 const char *name
= old_name
? old_name
: new_name
;
2040 struct cache_entry
*ce
= NULL
;
2043 patch
->rejected
= 1; /* we will drop this after we succeed */
2046 * Make sure that we do not have local modifications from the
2047 * index when we are looking at the index. Also make sure
2048 * we have the preimage file to be patched in the work tree,
2049 * unless --cached, which tells git to apply only in the index.
2053 unsigned st_mode
= 0;
2056 stat_ret
= lstat(old_name
, &st
);
2058 int pos
= cache_name_pos(old_name
, strlen(old_name
));
2060 return error("%s: does not exist in index",
2062 ce
= active_cache
[pos
];
2064 struct checkout costate
;
2065 if (errno
!= ENOENT
)
2066 return error("%s: %s", old_name
,
2069 costate
.base_dir
= "";
2070 costate
.base_dir_len
= 0;
2073 costate
.not_new
= 0;
2074 costate
.refresh_cache
= 1;
2075 if (checkout_entry(ce
,
2078 lstat(old_name
, &st
))
2081 if (!cached
&& verify_index_match(ce
, &st
))
2082 return error("%s: does not match index",
2085 st_mode
= ce
->ce_mode
;
2086 } else if (stat_ret
< 0)
2087 return error("%s: %s", old_name
, strerror(errno
));
2090 st_mode
= ce_mode_from_stat(ce
, st
.st_mode
);
2092 if (patch
->is_new
< 0)
2094 if (!patch
->old_mode
)
2095 patch
->old_mode
= st_mode
;
2096 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2097 return error("%s: wrong type", old_name
);
2098 if (st_mode
!= patch
->old_mode
)
2099 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
2100 old_name
, st_mode
, patch
->old_mode
);
2103 if (new_name
&& prev_patch
&& 0 < prev_patch
->is_delete
&&
2104 !strcmp(prev_patch
->old_name
, new_name
))
2106 * A type-change diff is always split into a patch to
2107 * delete old, immediately followed by a patch to
2108 * create new (see diff.c::run_diff()); in such a case
2109 * it is Ok that the entry to be deleted by the
2110 * previous patch is still in the working tree and in
2118 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2120 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2122 return error("%s: already exists in index", new_name
);
2124 int err
= check_to_create_blob(new_name
, ok_if_exists
);
2128 if (!patch
->new_mode
) {
2129 if (0 < patch
->is_new
)
2130 patch
->new_mode
= S_IFREG
| 0644;
2132 patch
->new_mode
= patch
->old_mode
;
2136 if (new_name
&& old_name
) {
2137 int same
= !strcmp(old_name
, new_name
);
2138 if (!patch
->new_mode
)
2139 patch
->new_mode
= patch
->old_mode
;
2140 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2141 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2142 patch
->new_mode
, new_name
, patch
->old_mode
,
2143 same
? "" : " of ", same
? "" : old_name
);
2146 if (apply_data(patch
, &st
, ce
) < 0)
2147 return error("%s: patch does not apply", name
);
2148 patch
->rejected
= 0;
2152 static int check_patch_list(struct patch
*patch
)
2154 struct patch
*prev_patch
= NULL
;
2157 for (prev_patch
= NULL
; patch
; patch
= patch
->next
) {
2158 if (apply_verbosely
)
2159 say_patch_name(stderr
,
2160 "Checking patch ", patch
, "...\n");
2161 err
|= check_patch(patch
, prev_patch
);
2167 /* This function tries to read the sha1 from the current index */
2168 static int get_current_sha1(const char *path
, unsigned char *sha1
)
2172 if (read_cache() < 0)
2174 pos
= cache_name_pos(path
, strlen(path
));
2177 hashcpy(sha1
, active_cache
[pos
]->sha1
);
2181 /* Build an index that contains the just the files needed for a 3way merge */
2182 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
2184 struct patch
*patch
;
2185 struct index_state result
= { 0 };
2188 /* Once we start supporting the reverse patch, it may be
2189 * worth showing the new sha1 prefix, but until then...
2191 for (patch
= list
; patch
; patch
= patch
->next
) {
2192 const unsigned char *sha1_ptr
;
2193 unsigned char sha1
[20];
2194 struct cache_entry
*ce
;
2197 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2198 if (0 < patch
->is_new
)
2200 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2201 /* git diff has no index line for mode/type changes */
2202 if (!patch
->lines_added
&& !patch
->lines_deleted
) {
2203 if (get_current_sha1(patch
->new_name
, sha1
) ||
2204 get_current_sha1(patch
->old_name
, sha1
))
2205 die("mode change for %s, which is not "
2206 "in current HEAD", name
);
2209 die("sha1 information is lacking or useless "
2214 ce
= make_cache_entry(patch
->old_mode
, sha1_ptr
, name
, 0, 0);
2215 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
2216 die ("Could not add %s to temporary index", name
);
2219 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
2220 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
2221 die ("Could not write temporary index to %s", filename
);
2223 discard_index(&result
);
2226 static void stat_patch_list(struct patch
*patch
)
2228 int files
, adds
, dels
;
2230 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
2232 adds
+= patch
->lines_added
;
2233 dels
+= patch
->lines_deleted
;
2237 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
2240 static void numstat_patch_list(struct patch
*patch
)
2242 for ( ; patch
; patch
= patch
->next
) {
2244 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2245 if (patch
->is_binary
)
2248 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
2249 write_name_quoted(name
, stdout
, line_termination
);
2253 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
2256 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
2258 printf(" %s %s\n", newdelete
, name
);
2261 static void show_mode_change(struct patch
*p
, int show_name
)
2263 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
2265 printf(" mode change %06o => %06o %s\n",
2266 p
->old_mode
, p
->new_mode
, p
->new_name
);
2268 printf(" mode change %06o => %06o\n",
2269 p
->old_mode
, p
->new_mode
);
2273 static void show_rename_copy(struct patch
*p
)
2275 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
2276 const char *old
, *new;
2278 /* Find common prefix */
2282 const char *slash_old
, *slash_new
;
2283 slash_old
= strchr(old
, '/');
2284 slash_new
= strchr(new, '/');
2287 slash_old
- old
!= slash_new
- new ||
2288 memcmp(old
, new, slash_new
- new))
2290 old
= slash_old
+ 1;
2291 new = slash_new
+ 1;
2293 /* p->old_name thru old is the common prefix, and old and new
2294 * through the end of names are renames
2296 if (old
!= p
->old_name
)
2297 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
2298 (int)(old
- p
->old_name
), p
->old_name
,
2299 old
, new, p
->score
);
2301 printf(" %s %s => %s (%d%%)\n", renamecopy
,
2302 p
->old_name
, p
->new_name
, p
->score
);
2303 show_mode_change(p
, 0);
2306 static void summary_patch_list(struct patch
*patch
)
2310 for (p
= patch
; p
; p
= p
->next
) {
2312 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
2313 else if (p
->is_delete
)
2314 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
2316 if (p
->is_rename
|| p
->is_copy
)
2317 show_rename_copy(p
);
2320 printf(" rewrite %s (%d%%)\n",
2321 p
->new_name
, p
->score
);
2322 show_mode_change(p
, 0);
2325 show_mode_change(p
, 1);
2331 static void patch_stats(struct patch
*patch
)
2333 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
2335 if (lines
> max_change
)
2337 if (patch
->old_name
) {
2338 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
2340 len
= strlen(patch
->old_name
);
2344 if (patch
->new_name
) {
2345 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
2347 len
= strlen(patch
->new_name
);
2353 static void remove_file(struct patch
*patch
, int rmdir_empty
)
2356 if (remove_file_from_cache(patch
->old_name
) < 0)
2357 die("unable to remove %s from index", patch
->old_name
);
2360 if (S_ISGITLINK(patch
->old_mode
)) {
2361 if (rmdir(patch
->old_name
))
2362 warning("unable to remove submodule %s",
2364 } else if (!unlink(patch
->old_name
) && rmdir_empty
) {
2365 char *name
= xstrdup(patch
->old_name
);
2366 char *end
= strrchr(name
, '/');
2371 end
= strrchr(name
, '/');
2378 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
2381 struct cache_entry
*ce
;
2382 int namelen
= strlen(path
);
2383 unsigned ce_size
= cache_entry_size(namelen
);
2388 ce
= xcalloc(1, ce_size
);
2389 memcpy(ce
->name
, path
, namelen
);
2390 ce
->ce_mode
= create_ce_mode(mode
);
2391 ce
->ce_flags
= namelen
;
2392 if (S_ISGITLINK(mode
)) {
2393 const char *s
= buf
;
2395 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
2396 die("corrupt patch for subproject %s", path
);
2399 if (lstat(path
, &st
) < 0)
2400 die("unable to stat newly created file %s",
2402 fill_stat_cache_info(ce
, &st
);
2404 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
2405 die("unable to create backing store for newly created file %s", path
);
2407 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
2408 die("unable to add cache entry for %s", path
);
2411 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
2416 if (S_ISGITLINK(mode
)) {
2418 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
2420 return mkdir(path
, 0777);
2423 if (has_symlinks
&& S_ISLNK(mode
))
2424 /* Although buf:size is counted string, it also is NUL
2427 return symlink(buf
, path
);
2429 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
2433 strbuf_init(&nbuf
, 0);
2434 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
2438 write_or_die(fd
, buf
, size
);
2439 strbuf_release(&nbuf
);
2442 die("closing file %s: %s", path
, strerror(errno
));
2447 * We optimistically assume that the directories exist,
2448 * which is true 99% of the time anyway. If they don't,
2449 * we create them and try again.
2451 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2455 if (!try_create_file(path
, mode
, buf
, size
))
2458 if (errno
== ENOENT
) {
2459 if (safe_create_leading_directories(path
))
2461 if (!try_create_file(path
, mode
, buf
, size
))
2465 if (errno
== EEXIST
|| errno
== EACCES
) {
2466 /* We may be trying to create a file where a directory
2470 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
2474 if (errno
== EEXIST
) {
2475 unsigned int nr
= getpid();
2478 const char *newpath
;
2479 newpath
= mkpath("%s~%u", path
, nr
);
2480 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2481 if (!rename(newpath
, path
))
2486 if (errno
!= EEXIST
)
2491 die("unable to write file %s mode %o", path
, mode
);
2494 static void create_file(struct patch
*patch
)
2496 char *path
= patch
->new_name
;
2497 unsigned mode
= patch
->new_mode
;
2498 unsigned long size
= patch
->resultsize
;
2499 char *buf
= patch
->result
;
2502 mode
= S_IFREG
| 0644;
2503 create_one_file(path
, mode
, buf
, size
);
2504 add_index_file(path
, mode
, buf
, size
);
2507 /* phase zero is to remove, phase one is to create */
2508 static void write_out_one_result(struct patch
*patch
, int phase
)
2510 if (patch
->is_delete
> 0) {
2512 remove_file(patch
, 1);
2515 if (patch
->is_new
> 0 || patch
->is_copy
) {
2521 * Rename or modification boils down to the same
2522 * thing: remove the old, write the new
2525 remove_file(patch
, patch
->is_rename
);
2530 static int write_out_one_reject(struct patch
*patch
)
2533 char namebuf
[PATH_MAX
];
2534 struct fragment
*frag
;
2537 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
2538 if (!frag
->rejected
)
2544 if (apply_verbosely
)
2545 say_patch_name(stderr
,
2546 "Applied patch ", patch
, " cleanly.\n");
2550 /* This should not happen, because a removal patch that leaves
2551 * contents are marked "rejected" at the patch level.
2553 if (!patch
->new_name
)
2554 die("internal error");
2556 /* Say this even without --verbose */
2557 say_patch_name(stderr
, "Applying patch ", patch
, " with");
2558 fprintf(stderr
, " %d rejects...\n", cnt
);
2560 cnt
= strlen(patch
->new_name
);
2561 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
2562 cnt
= ARRAY_SIZE(namebuf
) - 5;
2564 "warning: truncating .rej filename to %.*s.rej",
2565 cnt
- 1, patch
->new_name
);
2567 memcpy(namebuf
, patch
->new_name
, cnt
);
2568 memcpy(namebuf
+ cnt
, ".rej", 5);
2570 rej
= fopen(namebuf
, "w");
2572 return error("cannot open %s: %s", namebuf
, strerror(errno
));
2574 /* Normal git tools never deal with .rej, so do not pretend
2575 * this is a git patch by saying --git nor give extended
2576 * headers. While at it, maybe please "kompare" that wants
2577 * the trailing TAB and some garbage at the end of line ;-).
2579 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
2580 patch
->new_name
, patch
->new_name
);
2581 for (cnt
= 1, frag
= patch
->fragments
;
2583 cnt
++, frag
= frag
->next
) {
2584 if (!frag
->rejected
) {
2585 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
2588 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
2589 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
2590 if (frag
->patch
[frag
->size
-1] != '\n')
2597 static int write_out_results(struct patch
*list
, int skipped_patch
)
2603 if (!list
&& !skipped_patch
)
2604 return error("No changes");
2606 for (phase
= 0; phase
< 2; phase
++) {
2612 write_out_one_result(l
, phase
);
2613 if (phase
== 1 && write_out_one_reject(l
))
2622 static struct lock_file lock_file
;
2624 static struct excludes
{
2625 struct excludes
*next
;
2629 static int use_patch(struct patch
*p
)
2631 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2632 struct excludes
*x
= excludes
;
2634 if (fnmatch(x
->path
, pathname
, 0) == 0)
2638 if (0 < prefix_length
) {
2639 int pathlen
= strlen(pathname
);
2640 if (pathlen
<= prefix_length
||
2641 memcmp(prefix
, pathname
, prefix_length
))
2647 static void prefix_one(char **name
)
2649 char *old_name
= *name
;
2652 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
2656 static void prefix_patches(struct patch
*p
)
2658 if (!prefix
|| p
->is_toplevel_relative
)
2660 for ( ; p
; p
= p
->next
) {
2661 if (p
->new_name
== p
->old_name
) {
2662 char *prefixed
= p
->new_name
;
2663 prefix_one(&prefixed
);
2664 p
->new_name
= p
->old_name
= prefixed
;
2667 prefix_one(&p
->new_name
);
2668 prefix_one(&p
->old_name
);
2673 static int apply_patch(int fd
, const char *filename
, int inaccurate_eof
)
2677 struct patch
*list
= NULL
, **listp
= &list
;
2678 int skipped_patch
= 0;
2680 strbuf_init(&buf
, 0);
2681 patch_input_file
= filename
;
2682 read_patch_file(&buf
, fd
);
2684 while (offset
< buf
.len
) {
2685 struct patch
*patch
;
2688 patch
= xcalloc(1, sizeof(*patch
));
2689 patch
->inaccurate_eof
= inaccurate_eof
;
2690 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
2693 if (apply_in_reverse
)
2694 reverse_patches(patch
);
2696 prefix_patches(patch
);
2697 if (use_patch(patch
)) {
2700 listp
= &patch
->next
;
2703 /* perhaps free it a bit better? */
2710 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
2713 update_index
= check_index
&& apply
;
2714 if (update_index
&& newfd
< 0)
2715 newfd
= hold_locked_index(&lock_file
, 1);
2718 if (read_cache() < 0)
2719 die("unable to read index file");
2722 if ((check
|| apply
) &&
2723 check_patch_list(list
) < 0 &&
2727 if (apply
&& write_out_results(list
, skipped_patch
))
2731 build_fake_ancestor(list
, fake_ancestor
);
2734 stat_patch_list(list
);
2737 numstat_patch_list(list
);
2740 summary_patch_list(list
);
2742 strbuf_release(&buf
);
2746 static int git_apply_config(const char *var
, const char *value
)
2748 if (!strcmp(var
, "apply.whitespace")) {
2750 return config_error_nonbool(var
);
2751 apply_default_whitespace
= xstrdup(value
);
2754 return git_default_config(var
, value
);
2758 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
2762 int inaccurate_eof
= 0;
2764 int is_not_gitdir
= 0;
2766 const char *whitespace_option
= NULL
;
2768 prefix
= setup_git_directory_gently(&is_not_gitdir
);
2769 prefix_length
= prefix
? strlen(prefix
) : 0;
2770 git_config(git_apply_config
);
2771 if (apply_default_whitespace
)
2772 parse_whitespace_option(apply_default_whitespace
);
2774 for (i
= 1; i
< argc
; i
++) {
2775 const char *arg
= argv
[i
];
2779 if (!strcmp(arg
, "-")) {
2780 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2784 if (!prefixcmp(arg
, "--exclude=")) {
2785 struct excludes
*x
= xmalloc(sizeof(*x
));
2791 if (!prefixcmp(arg
, "-p")) {
2792 p_value
= atoi(arg
+ 2);
2796 if (!strcmp(arg
, "--no-add")) {
2800 if (!strcmp(arg
, "--stat")) {
2805 if (!strcmp(arg
, "--allow-binary-replacement") ||
2806 !strcmp(arg
, "--binary")) {
2807 continue; /* now no-op */
2809 if (!strcmp(arg
, "--numstat")) {
2814 if (!strcmp(arg
, "--summary")) {
2819 if (!strcmp(arg
, "--check")) {
2824 if (!strcmp(arg
, "--index")) {
2826 die("--index outside a repository");
2830 if (!strcmp(arg
, "--cached")) {
2832 die("--cached outside a repository");
2837 if (!strcmp(arg
, "--apply")) {
2841 if (!strcmp(arg
, "--build-fake-ancestor")) {
2844 die ("need a filename");
2845 fake_ancestor
= argv
[i
];
2848 if (!strcmp(arg
, "-z")) {
2849 line_termination
= 0;
2852 if (!prefixcmp(arg
, "-C")) {
2853 p_context
= strtoul(arg
+ 2, &end
, 0);
2855 die("unrecognized context count '%s'", arg
+ 2);
2858 if (!prefixcmp(arg
, "--whitespace=")) {
2859 whitespace_option
= arg
+ 13;
2860 parse_whitespace_option(arg
+ 13);
2863 if (!strcmp(arg
, "-R") || !strcmp(arg
, "--reverse")) {
2864 apply_in_reverse
= 1;
2867 if (!strcmp(arg
, "--unidiff-zero")) {
2871 if (!strcmp(arg
, "--reject")) {
2872 apply
= apply_with_reject
= apply_verbosely
= 1;
2875 if (!strcmp(arg
, "-v") || !strcmp(arg
, "--verbose")) {
2876 apply_verbosely
= 1;
2879 if (!strcmp(arg
, "--inaccurate-eof")) {
2883 if (0 < prefix_length
)
2884 arg
= prefix_filename(prefix
, prefix_length
, arg
);
2886 fd
= open(arg
, O_RDONLY
);
2890 set_default_whitespace_mode(whitespace_option
);
2891 errs
|= apply_patch(fd
, arg
, inaccurate_eof
);
2894 set_default_whitespace_mode(whitespace_option
);
2896 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2897 if (whitespace_error
) {
2898 if (squelch_whitespace_errors
&&
2899 squelch_whitespace_errors
< whitespace_error
) {
2901 whitespace_error
- squelch_whitespace_errors
;
2902 fprintf(stderr
, "warning: squelched %d "
2903 "whitespace error%s\n",
2905 squelched
== 1 ? "" : "s");
2907 if (ws_error_action
== die_on_ws_error
)
2908 die("%d line%s add%s whitespace errors.",
2910 whitespace_error
== 1 ? "" : "s",
2911 whitespace_error
== 1 ? "s" : "");
2912 if (applied_after_fixing_ws
&& apply
)
2913 fprintf(stderr
, "warning: %d line%s applied after"
2914 " fixing whitespace errors.\n",
2915 applied_after_fixing_ws
,
2916 applied_after_fixing_ws
== 1 ? "" : "s");
2917 else if (whitespace_error
)
2918 fprintf(stderr
, "warning: %d line%s add%s whitespace errors.\n",
2920 whitespace_error
== 1 ? "" : "s",
2921 whitespace_error
== 1 ? "s" : "");
2925 if (write_cache(newfd
, active_cache
, active_nr
) ||
2926 commit_locked_index(&lock_file
))
2927 die("Unable to write new index file");