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 */
147 unsigned long deflate_origlen
;
148 int lines_added
, lines_deleted
;
150 unsigned int is_toplevel_relative
:1;
151 unsigned int inaccurate_eof
:1;
152 unsigned int is_binary
:1;
153 unsigned int is_copy
:1;
154 unsigned int is_rename
:1;
155 struct fragment
*fragments
;
158 char old_sha1_prefix
[41];
159 char new_sha1_prefix
[41];
163 static void say_patch_name(FILE *output
, const char *pre
,
164 struct patch
*patch
, const char *post
)
167 if (patch
->old_name
&& patch
->new_name
&&
168 strcmp(patch
->old_name
, patch
->new_name
)) {
169 quote_c_style(patch
->old_name
, NULL
, output
, 0);
170 fputs(" => ", output
);
171 quote_c_style(patch
->new_name
, NULL
, output
, 0);
173 const char *n
= patch
->new_name
;
176 quote_c_style(n
, NULL
, output
, 0);
181 #define CHUNKSIZE (8192)
184 static void read_patch_file(struct strbuf
*sb
, int fd
)
186 if (strbuf_read(sb
, fd
, 0) < 0)
187 die("git-apply: read returned %s", strerror(errno
));
190 * Make sure that we have some slop in the buffer
191 * so that we can do speculative "memcmp" etc, and
192 * see to it that it is NUL-filled.
194 strbuf_grow(sb
, SLOP
);
195 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
198 static unsigned long linelen(const char *buffer
, unsigned long size
)
200 unsigned long len
= 0;
203 if (*buffer
++ == '\n')
209 static int is_dev_null(const char *str
)
211 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
217 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
219 if (c
== ' ' && !(terminate
& TERM_SPACE
))
221 if (c
== '\t' && !(terminate
& TERM_TAB
))
227 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
230 const char *start
= line
;
236 * Proposed "new-style" GNU patch/diff format; see
237 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
239 strbuf_init(&name
, 0);
240 if (!unquote_c_style(&name
, line
, NULL
)) {
243 for (cp
= name
.buf
; p_value
; p_value
--) {
244 cp
= strchr(cp
, '/');
250 /* name can later be freed, so we need
251 * to memmove, not just return cp
253 strbuf_remove(&name
, 0, cp
- name
.buf
);
255 return strbuf_detach(&name
, NULL
);
258 strbuf_release(&name
);
267 if (name_terminate(start
, line
-start
, c
, terminate
))
271 if (c
== '/' && !--p_value
)
281 * Generally we prefer the shorter name, especially
282 * if the other one is just a variation of that with
283 * something else tacked on to the end (ie "file.orig"
287 int deflen
= strlen(def
);
288 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
293 return xmemdupz(start
, len
);
296 static int count_slashes(const char *cp
)
308 * Given the string after "--- " or "+++ ", guess the appropriate
309 * p_value for the given patch.
311 static int guess_p_value(const char *nameline
)
316 if (is_dev_null(nameline
))
318 name
= find_name(nameline
, NULL
, 0, TERM_SPACE
| TERM_TAB
);
321 cp
= strchr(name
, '/');
326 * Does it begin with "a/$our-prefix" and such? Then this is
327 * very likely to apply to our directory.
329 if (!strncmp(name
, prefix
, prefix_length
))
330 val
= count_slashes(prefix
);
333 if (!strncmp(cp
, prefix
, prefix_length
))
334 val
= count_slashes(prefix
) + 1;
342 * Get the name etc info from the --/+++ lines of a traditional patch header
344 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
345 * files, we can happily check the index for a match, but for creating a
346 * new file we should try to match whatever "patch" does. I have no idea.
348 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
352 first
+= 4; /* skip "--- " */
353 second
+= 4; /* skip "+++ " */
354 if (!p_value_known
) {
356 p
= guess_p_value(first
);
357 q
= guess_p_value(second
);
359 if (0 <= p
&& p
== q
) {
364 if (is_dev_null(first
)) {
366 patch
->is_delete
= 0;
367 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
368 patch
->new_name
= name
;
369 } else if (is_dev_null(second
)) {
371 patch
->is_delete
= 1;
372 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
373 patch
->old_name
= name
;
375 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
376 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
377 patch
->old_name
= patch
->new_name
= name
;
380 die("unable to find filename in patch at line %d", linenr
);
383 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
389 * We're anal about diff header consistency, to make
390 * sure that we don't end up having strange ambiguous
391 * patches floating around.
393 * As a result, gitdiff_{old|new}name() will check
394 * their names against any previous information, just
397 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
399 if (!orig_name
&& !isnull
)
400 return find_name(line
, NULL
, p_value
, TERM_TAB
);
409 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
410 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
411 if (!another
|| memcmp(another
, name
, len
))
412 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
417 /* expect "/dev/null" */
418 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
419 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
424 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
426 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
430 static int gitdiff_newname(const char *line
, struct patch
*patch
)
432 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
436 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
438 patch
->old_mode
= strtoul(line
, NULL
, 8);
442 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
444 patch
->new_mode
= strtoul(line
, NULL
, 8);
448 static int gitdiff_delete(const char *line
, struct patch
*patch
)
450 patch
->is_delete
= 1;
451 patch
->old_name
= patch
->def_name
;
452 return gitdiff_oldmode(line
, patch
);
455 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
458 patch
->new_name
= patch
->def_name
;
459 return gitdiff_newmode(line
, patch
);
462 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
465 patch
->old_name
= find_name(line
, NULL
, 0, 0);
469 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
472 patch
->new_name
= find_name(line
, NULL
, 0, 0);
476 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
478 patch
->is_rename
= 1;
479 patch
->old_name
= find_name(line
, NULL
, 0, 0);
483 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
485 patch
->is_rename
= 1;
486 patch
->new_name
= find_name(line
, NULL
, 0, 0);
490 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
492 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
497 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
499 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
504 static int gitdiff_index(const char *line
, struct patch
*patch
)
507 * index line is N hexadecimal, "..", N hexadecimal,
508 * and optional space with octal mode.
510 const char *ptr
, *eol
;
513 ptr
= strchr(line
, '.');
514 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
517 memcpy(patch
->old_sha1_prefix
, line
, len
);
518 patch
->old_sha1_prefix
[len
] = 0;
521 ptr
= strchr(line
, ' ');
522 eol
= strchr(line
, '\n');
524 if (!ptr
|| eol
< ptr
)
530 memcpy(patch
->new_sha1_prefix
, line
, len
);
531 patch
->new_sha1_prefix
[len
] = 0;
533 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
538 * This is normal for a diff that doesn't change anything: we'll fall through
539 * into the next diff. Tell the parser to break out.
541 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
546 static const char *stop_at_slash(const char *line
, int llen
)
550 for (i
= 0; i
< llen
; i
++) {
559 * This is to extract the same name that appears on "diff --git"
560 * line. We do not find and return anything if it is a rename
561 * patch, and it is OK because we will find the name elsewhere.
562 * We need to reliably find name only when it is mode-change only,
563 * creation or deletion of an empty file. In any of these cases,
564 * both sides are the same name under a/ and b/ respectively.
566 static char *git_header_name(char *line
, int llen
)
569 const char *second
= NULL
;
572 line
+= strlen("diff --git ");
573 llen
-= strlen("diff --git ");
580 strbuf_init(&first
, 0);
583 if (unquote_c_style(&first
, line
, &second
))
586 /* advance to the first slash */
587 cp
= stop_at_slash(first
.buf
, first
.len
);
588 /* we do not accept absolute paths */
589 if (!cp
|| cp
== first
.buf
)
591 strbuf_remove(&first
, 0, cp
+ 1 - first
.buf
);
594 * second points at one past closing dq of name.
595 * find the second name.
597 while ((second
< line
+ llen
) && isspace(*second
))
600 if (line
+ llen
<= second
)
602 if (*second
== '"') {
603 if (unquote_c_style(&sp
, second
, NULL
))
605 cp
= stop_at_slash(sp
.buf
, sp
.len
);
606 if (!cp
|| cp
== sp
.buf
)
608 /* They must match, otherwise ignore */
609 if (strcmp(cp
+ 1, first
.buf
))
612 return strbuf_detach(&first
, NULL
);
615 /* unquoted second */
616 cp
= stop_at_slash(second
, line
+ llen
- second
);
617 if (!cp
|| cp
== second
)
620 if (line
+ llen
- cp
!= first
.len
+ 1 ||
621 memcmp(first
.buf
, cp
, first
.len
))
623 return strbuf_detach(&first
, NULL
);
626 strbuf_release(&first
);
631 /* unquoted first name */
632 name
= stop_at_slash(line
, llen
);
633 if (!name
|| name
== line
)
638 * since the first name is unquoted, a dq if exists must be
639 * the beginning of the second name.
641 for (second
= name
; second
< line
+ llen
; second
++) {
642 if (*second
== '"') {
647 if (unquote_c_style(&sp
, second
, NULL
))
650 np
= stop_at_slash(sp
.buf
, sp
.len
);
651 if (!np
|| np
== sp
.buf
)
655 len
= sp
.buf
+ sp
.len
- np
;
656 if (len
< second
- name
&&
657 !strncmp(np
, name
, len
) &&
658 isspace(name
[len
])) {
660 strbuf_remove(&sp
, 0, np
- sp
.buf
);
661 return strbuf_detach(&sp
, NULL
);
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 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
)
903 const char *err
= "Adds trailing whitespace";
908 * We know len is at least two, since we have a '+' and we
909 * checked that the last character was a '\n' before calling
910 * this function. That is, an addition of an empty line would
911 * check the '+' here. Sneaky...
913 if ((whitespace_rule
& WS_TRAILING_SPACE
) && isspace(line
[len
-2]))
917 * Make sure that there is no space followed by a tab in
920 if (whitespace_rule
& WS_SPACE_BEFORE_TAB
) {
921 err
= "Space in indent is followed by a tab";
922 for (i
= 1; i
< len
; i
++) {
923 if (line
[i
] == '\t') {
927 else if (line
[i
] == ' ')
935 * Make sure that the indentation does not contain more than
938 if ((whitespace_rule
& WS_INDENT_WITH_NON_TAB
) &&
939 (8 < len
) && !strncmp("+ ", line
, 9)) {
940 err
= "Indent more than 8 places with spaces";
947 if (squelch_whitespace_errors
&&
948 squelch_whitespace_errors
< whitespace_error
)
951 fprintf(stderr
, "%s.\n%s:%d:%.*s\n",
952 err
, patch_input_file
, linenr
, len
-2, line
+1);
956 * Parse a unified diff. Note that this really needs to parse each
957 * fragment separately, since the only way to know the difference
958 * between a "---" that is part of a patch, and a "---" that starts
959 * the next patch is to look at the line counts..
961 static int parse_fragment(char *line
, unsigned long size
,
962 struct patch
*patch
, struct fragment
*fragment
)
965 int len
= linelen(line
, size
), offset
;
966 unsigned long oldlines
, newlines
;
967 unsigned long leading
, trailing
;
969 offset
= parse_fragment_header(line
, len
, fragment
);
972 oldlines
= fragment
->oldlines
;
973 newlines
= fragment
->newlines
;
977 /* Parse the thing.. */
984 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
985 if (!oldlines
&& !newlines
)
987 len
= linelen(line
, size
);
988 if (!len
|| line
[len
-1] != '\n')
993 case '\n': /* newer GNU diff, an empty context line */
997 if (!deleted
&& !added
)
1002 if (apply_in_reverse
&&
1003 ws_error_action
!= nowarn_ws_error
)
1004 check_whitespace(line
, len
);
1010 if (!apply_in_reverse
&&
1011 ws_error_action
!= nowarn_ws_error
)
1012 check_whitespace(line
, len
);
1019 * We allow "\ No newline at end of file". Depending
1020 * on locale settings when the patch was produced we
1021 * don't know what this line looks like. The only
1022 * thing we do know is that it begins with "\ ".
1023 * Checking for 12 is just for sanity check -- any
1024 * l10n of "\ No newline..." is at least that long.
1027 if (len
< 12 || memcmp(line
, "\\ ", 2))
1032 if (oldlines
|| newlines
)
1034 fragment
->leading
= leading
;
1035 fragment
->trailing
= trailing
;
1038 * If a fragment ends with an incomplete line, we failed to include
1039 * it in the above loop because we hit oldlines == newlines == 0
1042 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1043 offset
+= linelen(line
, size
);
1045 patch
->lines_added
+= added
;
1046 patch
->lines_deleted
+= deleted
;
1048 if (0 < patch
->is_new
&& oldlines
)
1049 return error("new file depends on old contents");
1050 if (0 < patch
->is_delete
&& newlines
)
1051 return error("deleted file still has contents");
1055 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
1057 unsigned long offset
= 0;
1058 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1059 struct fragment
**fragp
= &patch
->fragments
;
1061 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1062 struct fragment
*fragment
;
1065 fragment
= xcalloc(1, sizeof(*fragment
));
1066 len
= parse_fragment(line
, size
, patch
, fragment
);
1068 die("corrupt patch at line %d", linenr
);
1069 fragment
->patch
= line
;
1070 fragment
->size
= len
;
1071 oldlines
+= fragment
->oldlines
;
1072 newlines
+= fragment
->newlines
;
1073 context
+= fragment
->leading
+ fragment
->trailing
;
1076 fragp
= &fragment
->next
;
1084 * If something was removed (i.e. we have old-lines) it cannot
1085 * be creation, and if something was added it cannot be
1086 * deletion. However, the reverse is not true; --unified=0
1087 * patches that only add are not necessarily creation even
1088 * though they do not have any old lines, and ones that only
1089 * delete are not necessarily deletion.
1091 * Unfortunately, a real creation/deletion patch do _not_ have
1092 * any context line by definition, so we cannot safely tell it
1093 * apart with --unified=0 insanity. At least if the patch has
1094 * more than one hunk it is not creation or deletion.
1096 if (patch
->is_new
< 0 &&
1097 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1099 if (patch
->is_delete
< 0 &&
1100 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1101 patch
->is_delete
= 0;
1102 if (!unidiff_zero
|| context
) {
1103 /* If the user says the patch is not generated with
1104 * --unified=0, or if we have seen context lines,
1105 * then not having oldlines means the patch is creation,
1106 * and not having newlines means the patch is deletion.
1108 if (patch
->is_new
< 0 && !oldlines
) {
1110 patch
->old_name
= NULL
;
1112 if (patch
->is_delete
< 0 && !newlines
) {
1113 patch
->is_delete
= 1;
1114 patch
->new_name
= NULL
;
1118 if (0 < patch
->is_new
&& oldlines
)
1119 die("new file %s depends on old contents", patch
->new_name
);
1120 if (0 < patch
->is_delete
&& newlines
)
1121 die("deleted file %s still has contents", patch
->old_name
);
1122 if (!patch
->is_delete
&& !newlines
&& context
)
1123 fprintf(stderr
, "** warning: file %s becomes empty but "
1124 "is not deleted\n", patch
->new_name
);
1129 static inline int metadata_changes(struct patch
*patch
)
1131 return patch
->is_rename
> 0 ||
1132 patch
->is_copy
> 0 ||
1133 patch
->is_new
> 0 ||
1135 (patch
->old_mode
&& patch
->new_mode
&&
1136 patch
->old_mode
!= patch
->new_mode
);
1139 static char *inflate_it(const void *data
, unsigned long size
,
1140 unsigned long inflated_size
)
1146 memset(&stream
, 0, sizeof(stream
));
1148 stream
.next_in
= (unsigned char *)data
;
1149 stream
.avail_in
= size
;
1150 stream
.next_out
= out
= xmalloc(inflated_size
);
1151 stream
.avail_out
= inflated_size
;
1152 inflateInit(&stream
);
1153 st
= inflate(&stream
, Z_FINISH
);
1154 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1161 static struct fragment
*parse_binary_hunk(char **buf_p
,
1162 unsigned long *sz_p
,
1167 * Expect a line that begins with binary patch method ("literal"
1168 * or "delta"), followed by the length of data before deflating.
1169 * a sequence of 'length-byte' followed by base-85 encoded data
1170 * should follow, terminated by a newline.
1172 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1173 * and we would limit the patch line to 66 characters,
1174 * so one line can fit up to 13 groups that would decode
1175 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1176 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1179 unsigned long size
= *sz_p
;
1180 char *buffer
= *buf_p
;
1182 unsigned long origlen
;
1185 struct fragment
*frag
;
1187 llen
= linelen(buffer
, size
);
1192 if (!prefixcmp(buffer
, "delta ")) {
1193 patch_method
= BINARY_DELTA_DEFLATED
;
1194 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1196 else if (!prefixcmp(buffer
, "literal ")) {
1197 patch_method
= BINARY_LITERAL_DEFLATED
;
1198 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1206 int byte_length
, max_byte_length
, newsize
;
1207 llen
= linelen(buffer
, size
);
1211 /* consume the blank line */
1217 * Minimum line is "A00000\n" which is 7-byte long,
1218 * and the line length must be multiple of 5 plus 2.
1220 if ((llen
< 7) || (llen
-2) % 5)
1222 max_byte_length
= (llen
- 2) / 5 * 4;
1223 byte_length
= *buffer
;
1224 if ('A' <= byte_length
&& byte_length
<= 'Z')
1225 byte_length
= byte_length
- 'A' + 1;
1226 else if ('a' <= byte_length
&& byte_length
<= 'z')
1227 byte_length
= byte_length
- 'a' + 27;
1230 /* if the input length was not multiple of 4, we would
1231 * have filler at the end but the filler should never
1234 if (max_byte_length
< byte_length
||
1235 byte_length
<= max_byte_length
- 4)
1237 newsize
= hunk_size
+ byte_length
;
1238 data
= xrealloc(data
, newsize
);
1239 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1241 hunk_size
= newsize
;
1246 frag
= xcalloc(1, sizeof(*frag
));
1247 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1251 frag
->size
= origlen
;
1255 frag
->binary_patch_method
= patch_method
;
1261 error("corrupt binary patch at line %d: %.*s",
1262 linenr
-1, llen
-1, buffer
);
1266 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1269 * We have read "GIT binary patch\n"; what follows is a line
1270 * that says the patch method (currently, either "literal" or
1271 * "delta") and the length of data before deflating; a
1272 * sequence of 'length-byte' followed by base-85 encoded data
1275 * When a binary patch is reversible, there is another binary
1276 * hunk in the same format, starting with patch method (either
1277 * "literal" or "delta") with the length of data, and a sequence
1278 * of length-byte + base-85 encoded data, terminated with another
1279 * empty line. This data, when applied to the postimage, produces
1282 struct fragment
*forward
;
1283 struct fragment
*reverse
;
1287 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1288 if (!forward
&& !status
)
1289 /* there has to be one hunk (forward hunk) */
1290 return error("unrecognized binary patch at line %d", linenr
-1);
1292 /* otherwise we already gave an error message */
1295 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1300 * Not having reverse hunk is not an error, but having
1301 * a corrupt reverse hunk is.
1303 free((void*) forward
->patch
);
1307 forward
->next
= reverse
;
1308 patch
->fragments
= forward
;
1309 patch
->is_binary
= 1;
1313 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1315 int hdrsize
, patchsize
;
1316 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1321 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1322 size
- offset
- hdrsize
, patch
);
1325 static const char *binhdr
[] = {
1330 static const char git_binary
[] = "GIT binary patch\n";
1332 int hd
= hdrsize
+ offset
;
1333 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1335 if (llen
== sizeof(git_binary
) - 1 &&
1336 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1339 used
= parse_binary(buffer
+ hd
+ llen
,
1340 size
- hd
- llen
, patch
);
1342 patchsize
= used
+ llen
;
1346 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1347 for (i
= 0; binhdr
[i
]; i
++) {
1348 int len
= strlen(binhdr
[i
]);
1349 if (len
< size
- hd
&&
1350 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1352 patch
->is_binary
= 1;
1359 /* Empty patch cannot be applied if it is a text patch
1360 * without metadata change. A binary patch appears
1363 if ((apply
|| check
) &&
1364 (!patch
->is_binary
&& !metadata_changes(patch
)))
1365 die("patch with only garbage at line %d", linenr
);
1368 return offset
+ hdrsize
+ patchsize
;
1371 #define swap(a,b) myswap((a),(b),sizeof(a))
1373 #define myswap(a, b, size) do { \
1374 unsigned char mytmp[size]; \
1375 memcpy(mytmp, &a, size); \
1376 memcpy(&a, &b, size); \
1377 memcpy(&b, mytmp, size); \
1380 static void reverse_patches(struct patch
*p
)
1382 for (; p
; p
= p
->next
) {
1383 struct fragment
*frag
= p
->fragments
;
1385 swap(p
->new_name
, p
->old_name
);
1386 swap(p
->new_mode
, p
->old_mode
);
1387 swap(p
->is_new
, p
->is_delete
);
1388 swap(p
->lines_added
, p
->lines_deleted
);
1389 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1391 for (; frag
; frag
= frag
->next
) {
1392 swap(frag
->newpos
, frag
->oldpos
);
1393 swap(frag
->newlines
, frag
->oldlines
);
1398 static const char pluses
[] =
1399 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1400 static const char minuses
[]=
1401 "----------------------------------------------------------------------";
1403 static void show_stats(struct patch
*patch
)
1405 struct strbuf qname
;
1406 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1409 strbuf_init(&qname
, 0);
1410 quote_c_style(cp
, &qname
, NULL
, 0);
1413 * "scale" the filename
1419 if (qname
.len
> max
) {
1420 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
1422 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
1423 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
1426 if (patch
->is_binary
) {
1427 printf(" %-*s | Bin\n", max
, qname
.buf
);
1428 strbuf_release(&qname
);
1432 printf(" %-*s |", max
, qname
.buf
);
1433 strbuf_release(&qname
);
1436 * scale the add/delete
1438 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
1439 add
= patch
->lines_added
;
1440 del
= patch
->lines_deleted
;
1442 if (max_change
> 0) {
1443 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
1444 add
= (add
* max
+ max_change
/ 2) / max_change
;
1447 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
1448 add
, pluses
, del
, minuses
);
1451 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
1453 switch (st
->st_mode
& S_IFMT
) {
1455 strbuf_grow(buf
, st
->st_size
);
1456 if (readlink(path
, buf
->buf
, st
->st_size
) != st
->st_size
)
1458 strbuf_setlen(buf
, st
->st_size
);
1461 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
1462 return error("unable to open or read %s", path
);
1463 convert_to_git(path
, buf
->buf
, buf
->len
, buf
);
1470 static int find_offset(const char *buf
, unsigned long size
,
1471 const char *fragment
, unsigned long fragsize
,
1472 int line
, int *lines
)
1475 unsigned long start
, backwards
, forwards
;
1477 if (fragsize
> size
)
1482 unsigned long offset
= 0;
1484 while (offset
+ fragsize
<= size
) {
1485 if (buf
[offset
++] == '\n') {
1493 /* Exact line number? */
1494 if ((start
+ fragsize
<= size
) &&
1495 !memcmp(buf
+ start
, fragment
, fragsize
))
1499 * There's probably some smart way to do this, but I'll leave
1500 * that to the smart and beautiful people. I'm simple and stupid.
1504 for (i
= 0; ; i
++) {
1511 if (forwards
+ fragsize
> size
)
1517 } while (backwards
&& buf
[backwards
-1] != '\n');
1520 while (forwards
+ fragsize
<= size
) {
1521 if (buf
[forwards
++] == '\n')
1527 if (try + fragsize
> size
)
1529 if (memcmp(buf
+ try, fragment
, fragsize
))
1539 * We should start searching forward and backward.
1544 static void remove_first_line(const char **rbuf
, int *rsize
)
1546 const char *buf
= *rbuf
;
1548 unsigned long offset
;
1550 while (offset
<= size
) {
1551 if (buf
[offset
++] == '\n')
1554 *rsize
= size
- offset
;
1555 *rbuf
= buf
+ offset
;
1558 static void remove_last_line(const char **rbuf
, int *rsize
)
1560 const char *buf
= *rbuf
;
1562 unsigned long offset
;
1564 while (offset
> 0) {
1565 if (buf
[--offset
] == '\n')
1568 *rsize
= offset
+ 1;
1571 static int apply_line(char *output
, const char *patch
, int plen
)
1574 * plen is number of bytes to be copied from patch,
1575 * starting at patch+1 (patch[0] is '+'). Typically
1576 * patch[plen] is '\n', unless this is the incomplete
1580 int add_nl_to_tail
= 0;
1582 int last_tab_in_indent
= -1;
1583 int last_space_in_indent
= -1;
1584 int need_fix_leading_space
= 0;
1587 if ((ws_error_action
!= correct_ws_error
) || !whitespace_error
||
1589 memcpy(output
, patch
+ 1, plen
);
1594 * Strip trailing whitespace
1596 if ((whitespace_rule
& WS_TRAILING_SPACE
) &&
1597 (1 < plen
&& isspace(patch
[plen
-1]))) {
1598 if (patch
[plen
] == '\n')
1601 while (0 < plen
&& isspace(patch
[plen
]))
1607 * Check leading whitespaces (indent)
1609 for (i
= 1; i
< plen
; i
++) {
1612 last_tab_in_indent
= i
;
1613 if ((whitespace_rule
& WS_SPACE_BEFORE_TAB
) &&
1614 0 <= last_space_in_indent
)
1615 need_fix_leading_space
= 1;
1616 } else if (ch
== ' ') {
1617 last_space_in_indent
= i
;
1618 if ((whitespace_rule
& WS_INDENT_WITH_NON_TAB
) &&
1619 last_tab_in_indent
< 0 &&
1621 need_fix_leading_space
= 1;
1628 if (need_fix_leading_space
) {
1629 int consecutive_spaces
= 0;
1630 int last
= last_tab_in_indent
+ 1;
1632 if (whitespace_rule
& WS_INDENT_WITH_NON_TAB
) {
1633 /* have "last" point at one past the indent */
1634 if (last_tab_in_indent
< last_space_in_indent
)
1635 last
= last_space_in_indent
+ 1;
1637 last
= last_tab_in_indent
+ 1;
1641 * between patch[1..last], strip the funny spaces,
1642 * updating them to tab as needed.
1644 for (i
= 1; i
< last
; i
++, plen
--) {
1647 consecutive_spaces
= 0;
1650 consecutive_spaces
++;
1651 if (consecutive_spaces
== 8) {
1653 consecutive_spaces
= 0;
1657 while (0 < consecutive_spaces
--)
1665 memcpy(output
, patch
+ i
, plen
);
1667 output
[plen
++] = '\n';
1669 applied_after_fixing_ws
++;
1670 return output
+ plen
- buf
;
1673 static int apply_one_fragment(struct strbuf
*buf
, struct fragment
*frag
,
1676 int match_beginning
, match_end
;
1677 const char *patch
= frag
->patch
;
1678 int offset
, size
= frag
->size
;
1679 char *old
= xmalloc(size
);
1680 char *new = xmalloc(size
);
1681 const char *oldlines
, *newlines
;
1682 int oldsize
= 0, newsize
= 0;
1683 int new_blank_lines_at_end
= 0;
1684 unsigned long leading
, trailing
;
1689 int len
= linelen(patch
, size
);
1691 int added_blank_line
= 0;
1697 * "plen" is how much of the line we should use for
1698 * the actual patch data. Normally we just remove the
1699 * first character on the line, but if the line is
1700 * followed by "\ No newline", then we also remove the
1701 * last one (which is the newline, of course).
1704 if (len
< size
&& patch
[len
] == '\\')
1707 if (apply_in_reverse
) {
1710 else if (first
== '+')
1716 /* Newer GNU diff, empty context line */
1718 /* ... followed by '\No newline'; nothing */
1720 old
[oldsize
++] = '\n';
1721 new[newsize
++] = '\n';
1725 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1729 /* Fall-through for ' ' */
1731 if (first
!= '+' || !no_add
) {
1732 int added
= apply_line(new + newsize
, patch
,
1736 added
== 1 && new[newsize
-1] == '\n')
1737 added_blank_line
= 1;
1740 case '@': case '\\':
1741 /* Ignore it, we already handled it */
1744 if (apply_verbosely
)
1745 error("invalid start of line: '%c'", first
);
1748 if (added_blank_line
)
1749 new_blank_lines_at_end
++;
1751 new_blank_lines_at_end
= 0;
1756 if (inaccurate_eof
&&
1757 oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1758 newsize
> 0 && new[newsize
- 1] == '\n') {
1765 leading
= frag
->leading
;
1766 trailing
= frag
->trailing
;
1769 * If we don't have any leading/trailing data in the patch,
1770 * we want it to match at the beginning/end of the file.
1772 * But that would break if the patch is generated with
1773 * --unified=0; sane people wouldn't do that to cause us
1774 * trouble, but we try to please not so sane ones as well.
1777 match_beginning
= (!leading
&& !frag
->oldpos
);
1781 match_beginning
= !leading
&& (frag
->oldpos
== 1);
1782 match_end
= !trailing
;
1788 offset
= find_offset(buf
->buf
, buf
->len
,
1789 oldlines
, oldsize
, pos
, &lines
);
1790 if (match_end
&& offset
+ oldsize
!= buf
->len
)
1792 if (match_beginning
&& offset
)
1795 if (ws_error_action
== correct_ws_error
&&
1796 (buf
->len
- oldsize
- offset
== 0)) /* end of file? */
1797 newsize
-= new_blank_lines_at_end
;
1799 /* Warn if it was necessary to reduce the number
1802 if ((leading
!= frag
->leading
) ||
1803 (trailing
!= frag
->trailing
))
1804 fprintf(stderr
, "Context reduced to (%ld/%ld)"
1805 " to apply fragment at %d\n",
1806 leading
, trailing
, pos
+ lines
);
1808 strbuf_splice(buf
, offset
, oldsize
, newlines
, newsize
);
1813 /* Am I at my context limits? */
1814 if ((leading
<= p_context
) && (trailing
<= p_context
))
1816 if (match_beginning
|| match_end
) {
1817 match_beginning
= match_end
= 0;
1821 * Reduce the number of context lines; reduce both
1822 * leading and trailing if they are equal otherwise
1823 * just reduce the larger context.
1825 if (leading
>= trailing
) {
1826 remove_first_line(&oldlines
, &oldsize
);
1827 remove_first_line(&newlines
, &newsize
);
1831 if (trailing
> leading
) {
1832 remove_last_line(&oldlines
, &oldsize
);
1833 remove_last_line(&newlines
, &newsize
);
1838 if (offset
&& apply_verbosely
)
1839 error("while searching for:\n%.*s", oldsize
, oldlines
);
1846 static int apply_binary_fragment(struct strbuf
*buf
, struct patch
*patch
)
1848 struct fragment
*fragment
= patch
->fragments
;
1852 /* Binary patch is irreversible without the optional second hunk */
1853 if (apply_in_reverse
) {
1854 if (!fragment
->next
)
1855 return error("cannot reverse-apply a binary patch "
1856 "without the reverse hunk to '%s'",
1858 ? patch
->new_name
: patch
->old_name
);
1859 fragment
= fragment
->next
;
1861 switch (fragment
->binary_patch_method
) {
1862 case BINARY_DELTA_DEFLATED
:
1863 dst
= patch_delta(buf
->buf
, buf
->len
, fragment
->patch
,
1864 fragment
->size
, &len
);
1867 /* XXX patch_delta NUL-terminates */
1868 strbuf_attach(buf
, dst
, len
, len
+ 1);
1870 case BINARY_LITERAL_DEFLATED
:
1872 strbuf_add(buf
, fragment
->patch
, fragment
->size
);
1878 static int apply_binary(struct strbuf
*buf
, struct patch
*patch
)
1880 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1881 unsigned char sha1
[20];
1884 * For safety, we require patch index line to contain
1885 * full 40-byte textual SHA1 for old and new, at least for now.
1887 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1888 strlen(patch
->new_sha1_prefix
) != 40 ||
1889 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1890 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1891 return error("cannot apply binary patch to '%s' "
1892 "without full index line", name
);
1894 if (patch
->old_name
) {
1896 * See if the old one matches what the patch
1899 hash_sha1_file(buf
->buf
, buf
->len
, blob_type
, sha1
);
1900 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1901 return error("the patch applies to '%s' (%s), "
1902 "which does not match the "
1903 "current contents.",
1904 name
, sha1_to_hex(sha1
));
1907 /* Otherwise, the old one must be empty. */
1909 return error("the patch applies to an empty "
1910 "'%s' but it is not empty", name
);
1913 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1914 if (is_null_sha1(sha1
)) {
1915 strbuf_release(buf
);
1916 return 0; /* deletion patch */
1919 if (has_sha1_file(sha1
)) {
1920 /* We already have the postimage */
1921 enum object_type type
;
1925 result
= read_sha1_file(sha1
, &type
, &size
);
1927 return error("the necessary postimage %s for "
1928 "'%s' cannot be read",
1929 patch
->new_sha1_prefix
, name
);
1930 /* XXX read_sha1_file NUL-terminates */
1931 strbuf_attach(buf
, result
, size
, size
+ 1);
1934 * We have verified buf matches the preimage;
1935 * apply the patch data to it, which is stored
1936 * in the patch->fragments->{patch,size}.
1938 if (apply_binary_fragment(buf
, patch
))
1939 return error("binary patch does not apply to '%s'",
1942 /* verify that the result matches */
1943 hash_sha1_file(buf
->buf
, buf
->len
, blob_type
, sha1
);
1944 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
1945 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
1946 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
1952 static int apply_fragments(struct strbuf
*buf
, struct patch
*patch
)
1954 struct fragment
*frag
= patch
->fragments
;
1955 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1957 if (patch
->is_binary
)
1958 return apply_binary(buf
, patch
);
1961 if (apply_one_fragment(buf
, frag
, patch
->inaccurate_eof
)) {
1962 error("patch failed: %s:%ld", name
, frag
->oldpos
);
1963 if (!apply_with_reject
)
1972 static int read_file_or_gitlink(struct cache_entry
*ce
, struct strbuf
*buf
)
1977 if (S_ISGITLINK(ntohl(ce
->ce_mode
))) {
1978 strbuf_grow(buf
, 100);
1979 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
1981 enum object_type type
;
1985 result
= read_sha1_file(ce
->sha1
, &type
, &sz
);
1988 /* XXX read_sha1_file NUL-terminates */
1989 strbuf_attach(buf
, result
, sz
, sz
+ 1);
1994 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
1998 strbuf_init(&buf
, 0);
2000 if (read_file_or_gitlink(ce
, &buf
))
2001 return error("read of %s failed", patch
->old_name
);
2002 } else if (patch
->old_name
) {
2003 if (S_ISGITLINK(patch
->old_mode
)) {
2005 read_file_or_gitlink(ce
, &buf
);
2008 * There is no way to apply subproject
2009 * patch without looking at the index.
2011 patch
->fragments
= NULL
;
2014 if (read_old_data(st
, patch
->old_name
, &buf
))
2015 return error("read of %s failed", patch
->old_name
);
2019 if (apply_fragments(&buf
, patch
) < 0)
2020 return -1; /* note with --reject this succeeds. */
2021 patch
->result
= strbuf_detach(&buf
, &patch
->resultsize
);
2023 if (0 < patch
->is_delete
&& patch
->resultsize
)
2024 return error("removal patch leaves file contents");
2029 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
2032 if (!lstat(new_name
, &nst
)) {
2033 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2036 * A leading component of new_name might be a symlink
2037 * that is going to be removed with this patch, but
2038 * still pointing at somewhere that has the path.
2039 * In such a case, path "new_name" does not exist as
2040 * far as git is concerned.
2042 if (has_symlink_leading_path(new_name
, NULL
))
2045 return error("%s: already exists in working directory", new_name
);
2047 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2048 return error("%s: %s", new_name
, strerror(errno
));
2052 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
2054 if (S_ISGITLINK(ntohl(ce
->ce_mode
))) {
2055 if (!S_ISDIR(st
->st_mode
))
2059 return ce_match_stat(ce
, st
, 1);
2062 static int check_patch(struct patch
*patch
, struct patch
*prev_patch
)
2065 const char *old_name
= patch
->old_name
;
2066 const char *new_name
= patch
->new_name
;
2067 const char *name
= old_name
? old_name
: new_name
;
2068 struct cache_entry
*ce
= NULL
;
2071 patch
->rejected
= 1; /* we will drop this after we succeed */
2074 * Make sure that we do not have local modifications from the
2075 * index when we are looking at the index. Also make sure
2076 * we have the preimage file to be patched in the work tree,
2077 * unless --cached, which tells git to apply only in the index.
2081 unsigned st_mode
= 0;
2084 stat_ret
= lstat(old_name
, &st
);
2086 int pos
= cache_name_pos(old_name
, strlen(old_name
));
2088 return error("%s: does not exist in index",
2090 ce
= active_cache
[pos
];
2092 struct checkout costate
;
2093 if (errno
!= ENOENT
)
2094 return error("%s: %s", old_name
,
2097 costate
.base_dir
= "";
2098 costate
.base_dir_len
= 0;
2101 costate
.not_new
= 0;
2102 costate
.refresh_cache
= 1;
2103 if (checkout_entry(ce
,
2106 lstat(old_name
, &st
))
2109 if (!cached
&& verify_index_match(ce
, &st
))
2110 return error("%s: does not match index",
2113 st_mode
= ntohl(ce
->ce_mode
);
2114 } else if (stat_ret
< 0)
2115 return error("%s: %s", old_name
, strerror(errno
));
2118 st_mode
= ntohl(ce_mode_from_stat(ce
, st
.st_mode
));
2120 if (patch
->is_new
< 0)
2122 if (!patch
->old_mode
)
2123 patch
->old_mode
= st_mode
;
2124 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2125 return error("%s: wrong type", old_name
);
2126 if (st_mode
!= patch
->old_mode
)
2127 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
2128 old_name
, st_mode
, patch
->old_mode
);
2131 if (new_name
&& prev_patch
&& 0 < prev_patch
->is_delete
&&
2132 !strcmp(prev_patch
->old_name
, new_name
))
2134 * A type-change diff is always split into a patch to
2135 * delete old, immediately followed by a patch to
2136 * create new (see diff.c::run_diff()); in such a case
2137 * it is Ok that the entry to be deleted by the
2138 * previous patch is still in the working tree and in
2146 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2148 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2150 return error("%s: already exists in index", new_name
);
2152 int err
= check_to_create_blob(new_name
, ok_if_exists
);
2156 if (!patch
->new_mode
) {
2157 if (0 < patch
->is_new
)
2158 patch
->new_mode
= S_IFREG
| 0644;
2160 patch
->new_mode
= patch
->old_mode
;
2164 if (new_name
&& old_name
) {
2165 int same
= !strcmp(old_name
, new_name
);
2166 if (!patch
->new_mode
)
2167 patch
->new_mode
= patch
->old_mode
;
2168 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2169 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2170 patch
->new_mode
, new_name
, patch
->old_mode
,
2171 same
? "" : " of ", same
? "" : old_name
);
2174 if (apply_data(patch
, &st
, ce
) < 0)
2175 return error("%s: patch does not apply", name
);
2176 patch
->rejected
= 0;
2180 static int check_patch_list(struct patch
*patch
)
2182 struct patch
*prev_patch
= NULL
;
2185 for (prev_patch
= NULL
; patch
; patch
= patch
->next
) {
2186 if (apply_verbosely
)
2187 say_patch_name(stderr
,
2188 "Checking patch ", patch
, "...\n");
2189 err
|= check_patch(patch
, prev_patch
);
2195 /* This function tries to read the sha1 from the current index */
2196 static int get_current_sha1(const char *path
, unsigned char *sha1
)
2200 if (read_cache() < 0)
2202 pos
= cache_name_pos(path
, strlen(path
));
2205 hashcpy(sha1
, active_cache
[pos
]->sha1
);
2209 /* Build an index that contains the just the files needed for a 3way merge */
2210 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
2212 struct patch
*patch
;
2213 struct index_state result
= { 0 };
2216 /* Once we start supporting the reverse patch, it may be
2217 * worth showing the new sha1 prefix, but until then...
2219 for (patch
= list
; patch
; patch
= patch
->next
) {
2220 const unsigned char *sha1_ptr
;
2221 unsigned char sha1
[20];
2222 struct cache_entry
*ce
;
2225 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2226 if (0 < patch
->is_new
)
2228 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2229 /* git diff has no index line for mode/type changes */
2230 if (!patch
->lines_added
&& !patch
->lines_deleted
) {
2231 if (get_current_sha1(patch
->new_name
, sha1
) ||
2232 get_current_sha1(patch
->old_name
, sha1
))
2233 die("mode change for %s, which is not "
2234 "in current HEAD", name
);
2237 die("sha1 information is lacking or useless "
2242 ce
= make_cache_entry(patch
->old_mode
, sha1_ptr
, name
, 0, 0);
2243 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
2244 die ("Could not add %s to temporary index", name
);
2247 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
2248 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
2249 die ("Could not write temporary index to %s", filename
);
2251 discard_index(&result
);
2254 static void stat_patch_list(struct patch
*patch
)
2256 int files
, adds
, dels
;
2258 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
2260 adds
+= patch
->lines_added
;
2261 dels
+= patch
->lines_deleted
;
2265 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
2268 static void numstat_patch_list(struct patch
*patch
)
2270 for ( ; patch
; patch
= patch
->next
) {
2272 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2273 if (patch
->is_binary
)
2276 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
2277 write_name_quoted(name
, stdout
, line_termination
);
2281 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
2284 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
2286 printf(" %s %s\n", newdelete
, name
);
2289 static void show_mode_change(struct patch
*p
, int show_name
)
2291 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
2293 printf(" mode change %06o => %06o %s\n",
2294 p
->old_mode
, p
->new_mode
, p
->new_name
);
2296 printf(" mode change %06o => %06o\n",
2297 p
->old_mode
, p
->new_mode
);
2301 static void show_rename_copy(struct patch
*p
)
2303 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
2304 const char *old
, *new;
2306 /* Find common prefix */
2310 const char *slash_old
, *slash_new
;
2311 slash_old
= strchr(old
, '/');
2312 slash_new
= strchr(new, '/');
2315 slash_old
- old
!= slash_new
- new ||
2316 memcmp(old
, new, slash_new
- new))
2318 old
= slash_old
+ 1;
2319 new = slash_new
+ 1;
2321 /* p->old_name thru old is the common prefix, and old and new
2322 * through the end of names are renames
2324 if (old
!= p
->old_name
)
2325 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
2326 (int)(old
- p
->old_name
), p
->old_name
,
2327 old
, new, p
->score
);
2329 printf(" %s %s => %s (%d%%)\n", renamecopy
,
2330 p
->old_name
, p
->new_name
, p
->score
);
2331 show_mode_change(p
, 0);
2334 static void summary_patch_list(struct patch
*patch
)
2338 for (p
= patch
; p
; p
= p
->next
) {
2340 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
2341 else if (p
->is_delete
)
2342 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
2344 if (p
->is_rename
|| p
->is_copy
)
2345 show_rename_copy(p
);
2348 printf(" rewrite %s (%d%%)\n",
2349 p
->new_name
, p
->score
);
2350 show_mode_change(p
, 0);
2353 show_mode_change(p
, 1);
2359 static void patch_stats(struct patch
*patch
)
2361 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
2363 if (lines
> max_change
)
2365 if (patch
->old_name
) {
2366 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
2368 len
= strlen(patch
->old_name
);
2372 if (patch
->new_name
) {
2373 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
2375 len
= strlen(patch
->new_name
);
2381 static void remove_file(struct patch
*patch
, int rmdir_empty
)
2384 if (remove_file_from_cache(patch
->old_name
) < 0)
2385 die("unable to remove %s from index", patch
->old_name
);
2388 if (S_ISGITLINK(patch
->old_mode
)) {
2389 if (rmdir(patch
->old_name
))
2390 warning("unable to remove submodule %s",
2392 } else if (!unlink(patch
->old_name
) && rmdir_empty
) {
2393 char *name
= xstrdup(patch
->old_name
);
2394 char *end
= strrchr(name
, '/');
2399 end
= strrchr(name
, '/');
2406 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
2409 struct cache_entry
*ce
;
2410 int namelen
= strlen(path
);
2411 unsigned ce_size
= cache_entry_size(namelen
);
2416 ce
= xcalloc(1, ce_size
);
2417 memcpy(ce
->name
, path
, namelen
);
2418 ce
->ce_mode
= create_ce_mode(mode
);
2419 ce
->ce_flags
= htons(namelen
);
2420 if (S_ISGITLINK(mode
)) {
2421 const char *s
= buf
;
2423 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
2424 die("corrupt patch for subproject %s", path
);
2427 if (lstat(path
, &st
) < 0)
2428 die("unable to stat newly created file %s",
2430 fill_stat_cache_info(ce
, &st
);
2432 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
2433 die("unable to create backing store for newly created file %s", path
);
2435 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
2436 die("unable to add cache entry for %s", path
);
2439 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
2444 if (S_ISGITLINK(mode
)) {
2446 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
2448 return mkdir(path
, 0777);
2451 if (has_symlinks
&& S_ISLNK(mode
))
2452 /* Although buf:size is counted string, it also is NUL
2455 return symlink(buf
, path
);
2457 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
2461 strbuf_init(&nbuf
, 0);
2462 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
2466 write_or_die(fd
, buf
, size
);
2467 strbuf_release(&nbuf
);
2470 die("closing file %s: %s", path
, strerror(errno
));
2475 * We optimistically assume that the directories exist,
2476 * which is true 99% of the time anyway. If they don't,
2477 * we create them and try again.
2479 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2483 if (!try_create_file(path
, mode
, buf
, size
))
2486 if (errno
== ENOENT
) {
2487 if (safe_create_leading_directories(path
))
2489 if (!try_create_file(path
, mode
, buf
, size
))
2493 if (errno
== EEXIST
|| errno
== EACCES
) {
2494 /* We may be trying to create a file where a directory
2498 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
2502 if (errno
== EEXIST
) {
2503 unsigned int nr
= getpid();
2506 const char *newpath
;
2507 newpath
= mkpath("%s~%u", path
, nr
);
2508 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2509 if (!rename(newpath
, path
))
2514 if (errno
!= EEXIST
)
2519 die("unable to write file %s mode %o", path
, mode
);
2522 static void create_file(struct patch
*patch
)
2524 char *path
= patch
->new_name
;
2525 unsigned mode
= patch
->new_mode
;
2526 unsigned long size
= patch
->resultsize
;
2527 char *buf
= patch
->result
;
2530 mode
= S_IFREG
| 0644;
2531 create_one_file(path
, mode
, buf
, size
);
2532 add_index_file(path
, mode
, buf
, size
);
2535 /* phase zero is to remove, phase one is to create */
2536 static void write_out_one_result(struct patch
*patch
, int phase
)
2538 if (patch
->is_delete
> 0) {
2540 remove_file(patch
, 1);
2543 if (patch
->is_new
> 0 || patch
->is_copy
) {
2549 * Rename or modification boils down to the same
2550 * thing: remove the old, write the new
2553 remove_file(patch
, patch
->is_rename
);
2558 static int write_out_one_reject(struct patch
*patch
)
2561 char namebuf
[PATH_MAX
];
2562 struct fragment
*frag
;
2565 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
2566 if (!frag
->rejected
)
2572 if (apply_verbosely
)
2573 say_patch_name(stderr
,
2574 "Applied patch ", patch
, " cleanly.\n");
2578 /* This should not happen, because a removal patch that leaves
2579 * contents are marked "rejected" at the patch level.
2581 if (!patch
->new_name
)
2582 die("internal error");
2584 /* Say this even without --verbose */
2585 say_patch_name(stderr
, "Applying patch ", patch
, " with");
2586 fprintf(stderr
, " %d rejects...\n", cnt
);
2588 cnt
= strlen(patch
->new_name
);
2589 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
2590 cnt
= ARRAY_SIZE(namebuf
) - 5;
2592 "warning: truncating .rej filename to %.*s.rej",
2593 cnt
- 1, patch
->new_name
);
2595 memcpy(namebuf
, patch
->new_name
, cnt
);
2596 memcpy(namebuf
+ cnt
, ".rej", 5);
2598 rej
= fopen(namebuf
, "w");
2600 return error("cannot open %s: %s", namebuf
, strerror(errno
));
2602 /* Normal git tools never deal with .rej, so do not pretend
2603 * this is a git patch by saying --git nor give extended
2604 * headers. While at it, maybe please "kompare" that wants
2605 * the trailing TAB and some garbage at the end of line ;-).
2607 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
2608 patch
->new_name
, patch
->new_name
);
2609 for (cnt
= 1, frag
= patch
->fragments
;
2611 cnt
++, frag
= frag
->next
) {
2612 if (!frag
->rejected
) {
2613 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
2616 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
2617 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
2618 if (frag
->patch
[frag
->size
-1] != '\n')
2625 static int write_out_results(struct patch
*list
, int skipped_patch
)
2631 if (!list
&& !skipped_patch
)
2632 return error("No changes");
2634 for (phase
= 0; phase
< 2; phase
++) {
2640 write_out_one_result(l
, phase
);
2641 if (phase
== 1 && write_out_one_reject(l
))
2650 static struct lock_file lock_file
;
2652 static struct excludes
{
2653 struct excludes
*next
;
2657 static int use_patch(struct patch
*p
)
2659 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2660 struct excludes
*x
= excludes
;
2662 if (fnmatch(x
->path
, pathname
, 0) == 0)
2666 if (0 < prefix_length
) {
2667 int pathlen
= strlen(pathname
);
2668 if (pathlen
<= prefix_length
||
2669 memcmp(prefix
, pathname
, prefix_length
))
2675 static void prefix_one(char **name
)
2677 char *old_name
= *name
;
2680 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
2684 static void prefix_patches(struct patch
*p
)
2686 if (!prefix
|| p
->is_toplevel_relative
)
2688 for ( ; p
; p
= p
->next
) {
2689 if (p
->new_name
== p
->old_name
) {
2690 char *prefixed
= p
->new_name
;
2691 prefix_one(&prefixed
);
2692 p
->new_name
= p
->old_name
= prefixed
;
2695 prefix_one(&p
->new_name
);
2696 prefix_one(&p
->old_name
);
2701 static int apply_patch(int fd
, const char *filename
, int inaccurate_eof
)
2705 struct patch
*list
= NULL
, **listp
= &list
;
2706 int skipped_patch
= 0;
2708 strbuf_init(&buf
, 0);
2709 patch_input_file
= filename
;
2710 read_patch_file(&buf
, fd
);
2712 while (offset
< buf
.len
) {
2713 struct patch
*patch
;
2716 patch
= xcalloc(1, sizeof(*patch
));
2717 patch
->inaccurate_eof
= inaccurate_eof
;
2718 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
2721 if (apply_in_reverse
)
2722 reverse_patches(patch
);
2724 prefix_patches(patch
);
2725 if (use_patch(patch
)) {
2728 listp
= &patch
->next
;
2731 /* perhaps free it a bit better? */
2738 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
2741 update_index
= check_index
&& apply
;
2742 if (update_index
&& newfd
< 0)
2743 newfd
= hold_locked_index(&lock_file
, 1);
2746 if (read_cache() < 0)
2747 die("unable to read index file");
2750 if ((check
|| apply
) &&
2751 check_patch_list(list
) < 0 &&
2755 if (apply
&& write_out_results(list
, skipped_patch
))
2759 build_fake_ancestor(list
, fake_ancestor
);
2762 stat_patch_list(list
);
2765 numstat_patch_list(list
);
2768 summary_patch_list(list
);
2770 strbuf_release(&buf
);
2774 static int git_apply_config(const char *var
, const char *value
)
2776 if (!strcmp(var
, "apply.whitespace")) {
2777 apply_default_whitespace
= xstrdup(value
);
2780 return git_default_config(var
, value
);
2784 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
2788 int inaccurate_eof
= 0;
2790 int is_not_gitdir
= 0;
2792 const char *whitespace_option
= NULL
;
2794 prefix
= setup_git_directory_gently(&is_not_gitdir
);
2795 prefix_length
= prefix
? strlen(prefix
) : 0;
2796 git_config(git_apply_config
);
2797 if (apply_default_whitespace
)
2798 parse_whitespace_option(apply_default_whitespace
);
2800 for (i
= 1; i
< argc
; i
++) {
2801 const char *arg
= argv
[i
];
2805 if (!strcmp(arg
, "-")) {
2806 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2810 if (!prefixcmp(arg
, "--exclude=")) {
2811 struct excludes
*x
= xmalloc(sizeof(*x
));
2817 if (!prefixcmp(arg
, "-p")) {
2818 p_value
= atoi(arg
+ 2);
2822 if (!strcmp(arg
, "--no-add")) {
2826 if (!strcmp(arg
, "--stat")) {
2831 if (!strcmp(arg
, "--allow-binary-replacement") ||
2832 !strcmp(arg
, "--binary")) {
2833 continue; /* now no-op */
2835 if (!strcmp(arg
, "--numstat")) {
2840 if (!strcmp(arg
, "--summary")) {
2845 if (!strcmp(arg
, "--check")) {
2850 if (!strcmp(arg
, "--index")) {
2852 die("--index outside a repository");
2856 if (!strcmp(arg
, "--cached")) {
2858 die("--cached outside a repository");
2863 if (!strcmp(arg
, "--apply")) {
2867 if (!strcmp(arg
, "--build-fake-ancestor")) {
2870 die ("need a filename");
2871 fake_ancestor
= argv
[i
];
2874 if (!strcmp(arg
, "-z")) {
2875 line_termination
= 0;
2878 if (!prefixcmp(arg
, "-C")) {
2879 p_context
= strtoul(arg
+ 2, &end
, 0);
2881 die("unrecognized context count '%s'", arg
+ 2);
2884 if (!prefixcmp(arg
, "--whitespace=")) {
2885 whitespace_option
= arg
+ 13;
2886 parse_whitespace_option(arg
+ 13);
2889 if (!strcmp(arg
, "-R") || !strcmp(arg
, "--reverse")) {
2890 apply_in_reverse
= 1;
2893 if (!strcmp(arg
, "--unidiff-zero")) {
2897 if (!strcmp(arg
, "--reject")) {
2898 apply
= apply_with_reject
= apply_verbosely
= 1;
2901 if (!strcmp(arg
, "-v") || !strcmp(arg
, "--verbose")) {
2902 apply_verbosely
= 1;
2905 if (!strcmp(arg
, "--inaccurate-eof")) {
2909 if (0 < prefix_length
)
2910 arg
= prefix_filename(prefix
, prefix_length
, arg
);
2912 fd
= open(arg
, O_RDONLY
);
2916 set_default_whitespace_mode(whitespace_option
);
2917 errs
|= apply_patch(fd
, arg
, inaccurate_eof
);
2920 set_default_whitespace_mode(whitespace_option
);
2922 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2923 if (whitespace_error
) {
2924 if (squelch_whitespace_errors
&&
2925 squelch_whitespace_errors
< whitespace_error
) {
2927 whitespace_error
- squelch_whitespace_errors
;
2928 fprintf(stderr
, "warning: squelched %d "
2929 "whitespace error%s\n",
2931 squelched
== 1 ? "" : "s");
2933 if (ws_error_action
== die_on_ws_error
)
2934 die("%d line%s add%s whitespace errors.",
2936 whitespace_error
== 1 ? "" : "s",
2937 whitespace_error
== 1 ? "s" : "");
2938 if (applied_after_fixing_ws
)
2939 fprintf(stderr
, "warning: %d line%s applied after"
2940 " fixing whitespace errors.\n",
2941 applied_after_fixing_ws
,
2942 applied_after_fixing_ws
== 1 ? "" : "s");
2943 else if (whitespace_error
)
2944 fprintf(stderr
, "warning: %d line%s add%s whitespace errors.\n",
2946 whitespace_error
== 1 ? "" : "s",
2947 whitespace_error
== 1 ? "s" : "");
2951 if (write_cache(newfd
, active_cache
, active_nr
) ||
2952 close(newfd
) || commit_locked_index(&lock_file
))
2953 die("Unable to write new index file");