projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-rm: honor -n flag.
[git.git]
/
builtin-apply.c
diff --git
a/builtin-apply.c
b/builtin-apply.c
index
4056b9d
..
e113c74
100644
(file)
--- a/
builtin-apply.c
+++ b/
builtin-apply.c
@@
-8,6
+8,7
@@
*/
#include <fnmatch.h>
#include "cache.h"
*/
#include <fnmatch.h>
#include "cache.h"
+#include "cache-tree.h"
#include "quote.h"
#include "blob.h"
#include "delta.h"
#include "quote.h"
#include "blob.h"
#include "delta.h"
@@
-1334,6
+1335,7
@@
static int apply_line(char *output, const char *patch, int plen)
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
{
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
{
+ int match_beginning, match_end;
char *buf = desc->buffer;
const char *patch = frag->patch;
int offset, size = frag->size;
char *buf = desc->buffer;
const char *patch = frag->patch;
int offset, size = frag->size;
@@
-1396,10
+1398,22
@@
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
newlines = new;
leading = frag->leading;
trailing = frag->trailing;
newlines = new;
leading = frag->leading;
trailing = frag->trailing;
+
+ /*
+ * If we don't have any leading/trailing data in the patch,
+ * we want it to match at the beginning/end of the file.
+ */
+ match_beginning = !leading && (frag->oldpos == 1);
+ match_end = !trailing;
+
lines = 0;
pos = frag->newpos;
for (;;) {
offset = find_offset(buf, desc->size, oldlines, oldsize, pos, &lines);
lines = 0;
pos = frag->newpos;
for (;;) {
offset = find_offset(buf, desc->size, oldlines, oldsize, pos, &lines);
+ if (match_end && offset + oldsize != desc->size)
+ offset = -1;
+ if (match_beginning && offset)
+ offset = -1;
if (offset >= 0) {
int diff = newsize - oldsize;
unsigned long size = desc->size + diff;
if (offset >= 0) {
int diff = newsize - oldsize;
unsigned long size = desc->size + diff;
@@
-1429,6
+1443,10
@@
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
/* Am I at my context limits? */
if ((leading <= p_context) && (trailing <= p_context))
break;
/* Am I at my context limits? */
if ((leading <= p_context) && (trailing <= p_context))
break;
+ if (match_beginning || match_end) {
+ match_beginning = match_end = 0;
+ continue;
+ }
/* Reduce the number of context lines
* Reduce both leading and trailing if they are equal
* otherwise just reduce the larger context.
/* Reduce the number of context lines
* Reduce both leading and trailing if they are equal
* otherwise just reduce the larger context.
@@
-1918,6
+1936,7
@@
static void remove_file(struct patch *patch)
if (write_index) {
if (remove_file_from_cache(patch->old_name) < 0)
die("unable to remove %s from index", patch->old_name);
if (write_index) {
if (remove_file_from_cache(patch->old_name) < 0)
die("unable to remove %s from index", patch->old_name);
+ cache_tree_invalidate_path(active_cache_tree, patch->old_name);
}
if (!cached)
unlink(patch->old_name);
}
if (!cached)
unlink(patch->old_name);
@@
-2019,8
+2038,9
@@
static void create_file(struct patch *patch)
if (!mode)
mode = S_IFREG | 0644;
if (!mode)
mode = S_IFREG | 0644;
- create_one_file(path, mode, buf, size);
+ create_one_file(path, mode, buf, size);
add_index_file(path, mode, buf, size);
add_index_file(path, mode, buf, size);
+ cache_tree_invalidate_path(active_cache_tree, path);
}
static void write_out_one_result(struct patch *patch)
}
static void write_out_one_result(struct patch *patch)
@@
-2052,7
+2072,7
@@
static void write_out_results(struct patch *list, int skipped_patch)
}
}
}
}
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
static struct excludes {
struct excludes *next;
static struct excludes {
struct excludes *next;
@@
-2113,8
+2133,12
@@
static int apply_patch(int fd, const char *filename)
apply = 0;
write_index = check_index && apply;
apply = 0;
write_index = check_index && apply;
- if (write_index && newfd < 0)
- newfd = hold_index_file_for_update(&cache_file, get_index_file());
+ if (write_index && newfd < 0) {
+ newfd = hold_lock_file_for_update(&lock_file,
+ get_index_file());
+ if (newfd < 0)
+ die("unable to create new index file");
+ }
if (check_index) {
if (read_cache() < 0)
die("unable to read index file");
if (check_index) {
if (read_cache() < 0)
die("unable to read index file");
@@
-2292,8
+2316,8
@@
int cmd_apply(int argc, const char **argv, char **envp)
if (write_index) {
if (write_cache(newfd, active_cache, active_nr) ||
if (write_index) {
if (write_cache(newfd, active_cache, active_nr) ||
- commit_
index_file(&cache
_file))
- die("Unable to write new
cache
file");
+ commit_
lock_file(&lock
_file))
+ die("Unable to write new
index
file");
}
return 0;
}
return 0;