mirror of
https://github.com/git/git.git
synced 2024-11-25 19:04:18 +08:00
ec1fcc16af
This adds more cruft to diff --git header to record the blob SHA1 and the mode the patch/diff is intended to be applied against, to help the receiving end fall back on a three-way merge. The new header looks like this: diff --git a/apply.c b/apply.c index 7be5041..8366082 100644 --- a/apply.c +++ b/apply.c @@ -14,6 +14,7 @@ // files that are being modified, but doesn't apply the patch // --stat does just a diffstat, and doesn't actually apply +// --show-index-info shows the old and new index info for... ... Upon receiving such a patch, if the patch did not apply cleanly to the target tree, the recipient can try to find the matching old objects in her object database and create a temporary tree, apply the patch to that temporary tree, and attempt a 3-way merge between the patched temporary tree and the target tree using the original temporary tree as the common ancestor. The patch lifts the code to compute the hash for an on-filesystem object from update-index.c and makes it available to the diff output routine. Signed-off-by: Junio C Hamano <junkio@cox.net>
375 lines
8.6 KiB
C
375 lines
8.6 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "strbuf.h"
|
|
|
|
/*
|
|
* Default to not allowing changes to the list of files. The
|
|
* tool doesn't actually care, but this makes it harder to add
|
|
* files to the revision control by mistake by doing something
|
|
* like "git-update-index *" and suddenly having all the object
|
|
* files be revision controlled.
|
|
*/
|
|
static int allow_add = 0, allow_remove = 0, allow_replace = 0, allow_unmerged = 0, not_new = 0, quiet = 0, info_only = 0;
|
|
static int force_remove;
|
|
|
|
/* Three functions to allow overloaded pointer return; see linux/err.h */
|
|
static inline void *ERR_PTR(long error)
|
|
{
|
|
return (void *) error;
|
|
}
|
|
|
|
static inline long PTR_ERR(const void *ptr)
|
|
{
|
|
return (long) ptr;
|
|
}
|
|
|
|
static inline long IS_ERR(const void *ptr)
|
|
{
|
|
return (unsigned long)ptr > (unsigned long)-1000L;
|
|
}
|
|
|
|
static int add_file_to_cache(const char *path)
|
|
{
|
|
int size, namelen, option, status;
|
|
struct cache_entry *ce;
|
|
struct stat st;
|
|
|
|
status = lstat(path, &st);
|
|
if (status < 0 || S_ISDIR(st.st_mode)) {
|
|
/* When we used to have "path" and now we want to add
|
|
* "path/file", we need a way to remove "path" before
|
|
* being able to add "path/file". However,
|
|
* "git-update-index --remove path" would not work.
|
|
* --force-remove can be used but this is more user
|
|
* friendly, especially since we can do the opposite
|
|
* case just fine without --force-remove.
|
|
*/
|
|
if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
|
|
if (allow_remove) {
|
|
if (remove_file_from_cache(path))
|
|
return error("%s: cannot remove from the index",
|
|
path);
|
|
else
|
|
return 0;
|
|
} else if (status < 0) {
|
|
return error("%s: does not exist and --remove not passed",
|
|
path);
|
|
}
|
|
}
|
|
if (0 == status)
|
|
return error("%s: is a directory - add files inside instead",
|
|
path);
|
|
else
|
|
return error("lstat(\"%s\"): %s", path,
|
|
strerror(errno));
|
|
}
|
|
namelen = strlen(path);
|
|
size = cache_entry_size(namelen);
|
|
ce = xmalloc(size);
|
|
memset(ce, 0, size);
|
|
memcpy(ce->name, path, namelen);
|
|
fill_stat_cache_info(ce, &st);
|
|
ce->ce_mode = create_ce_mode(st.st_mode);
|
|
ce->ce_flags = htons(namelen);
|
|
|
|
if (index_path(ce->sha1, path, &st, !info_only))
|
|
return -1;
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
|
if (add_cache_entry(ce, option))
|
|
return error("%s: cannot add to the index - missing --add option?",
|
|
path);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* "refresh" does not calculate a new sha1 file or bring the
|
|
* cache up-to-date for mode/content changes. But what it
|
|
* _does_ do is to "re-match" the stat information of a file
|
|
* with the cache, so that you can refresh the cache for a
|
|
* file that hasn't been changed but where the stat entry is
|
|
* out of date.
|
|
*
|
|
* For example, you'd want to do this after doing a "git-read-tree",
|
|
* to link up the stat cache details with the proper files.
|
|
*/
|
|
static struct cache_entry *refresh_entry(struct cache_entry *ce)
|
|
{
|
|
struct stat st;
|
|
struct cache_entry *updated;
|
|
int changed, size;
|
|
|
|
if (lstat(ce->name, &st) < 0)
|
|
return ERR_PTR(-errno);
|
|
|
|
changed = ce_match_stat(ce, &st);
|
|
if (!changed)
|
|
return NULL;
|
|
|
|
if (ce_modified(ce, &st))
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
size = ce_size(ce);
|
|
updated = xmalloc(size);
|
|
memcpy(updated, ce, size);
|
|
fill_stat_cache_info(updated, &st);
|
|
return updated;
|
|
}
|
|
|
|
static int refresh_cache(void)
|
|
{
|
|
int i;
|
|
int has_errors = 0;
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
struct cache_entry *ce, *new;
|
|
ce = active_cache[i];
|
|
if (ce_stage(ce)) {
|
|
while ((i < active_nr) &&
|
|
! strcmp(active_cache[i]->name, ce->name))
|
|
i++;
|
|
i--;
|
|
if (allow_unmerged)
|
|
continue;
|
|
printf("%s: needs merge\n", ce->name);
|
|
has_errors = 1;
|
|
continue;
|
|
}
|
|
|
|
new = refresh_entry(ce);
|
|
if (!new)
|
|
continue;
|
|
if (IS_ERR(new)) {
|
|
if (not_new && PTR_ERR(new) == -ENOENT)
|
|
continue;
|
|
if (quiet)
|
|
continue;
|
|
printf("%s: needs update\n", ce->name);
|
|
has_errors = 1;
|
|
continue;
|
|
}
|
|
active_cache_changed = 1;
|
|
/* You can NOT just free active_cache[i] here, since it
|
|
* might not be necessarily malloc()ed but can also come
|
|
* from mmap(). */
|
|
active_cache[i] = new;
|
|
}
|
|
return has_errors;
|
|
}
|
|
|
|
/*
|
|
* We fundamentally don't like some paths: we don't want
|
|
* dot or dot-dot anywhere, and for obvious reasons don't
|
|
* want to recurse into ".git" either.
|
|
*
|
|
* Also, we don't want double slashes or slashes at the
|
|
* end that can make pathnames ambiguous.
|
|
*/
|
|
static int verify_dotfile(const char *rest)
|
|
{
|
|
/*
|
|
* The first character was '.', but that
|
|
* has already been discarded, we now test
|
|
* the rest.
|
|
*/
|
|
switch (*rest) {
|
|
/* "." is not allowed */
|
|
case '\0': case '/':
|
|
return 0;
|
|
|
|
/*
|
|
* ".git" followed by NUL or slash is bad. This
|
|
* shares the path end test with the ".." case.
|
|
*/
|
|
case 'g':
|
|
if (rest[1] != 'i')
|
|
break;
|
|
if (rest[2] != 't')
|
|
break;
|
|
rest += 2;
|
|
/* fallthrough */
|
|
case '.':
|
|
if (rest[1] == '\0' || rest[1] == '/')
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int verify_path(const char *path)
|
|
{
|
|
char c;
|
|
|
|
goto inside;
|
|
for (;;) {
|
|
if (!c)
|
|
return 1;
|
|
if (c == '/') {
|
|
inside:
|
|
c = *path++;
|
|
switch (c) {
|
|
default:
|
|
continue;
|
|
case '/': case '\0':
|
|
break;
|
|
case '.':
|
|
if (verify_dotfile(path))
|
|
continue;
|
|
}
|
|
return 0;
|
|
}
|
|
c = *path++;
|
|
}
|
|
}
|
|
|
|
static int add_cacheinfo(const char *arg1, const char *arg2, const char *arg3)
|
|
{
|
|
int size, len, option;
|
|
unsigned int mode;
|
|
unsigned char sha1[20];
|
|
struct cache_entry *ce;
|
|
|
|
if (sscanf(arg1, "%o", &mode) != 1)
|
|
return -1;
|
|
if (get_sha1_hex(arg2, sha1))
|
|
return -1;
|
|
if (!verify_path(arg3))
|
|
return -1;
|
|
|
|
len = strlen(arg3);
|
|
size = cache_entry_size(len);
|
|
ce = xmalloc(size);
|
|
memset(ce, 0, size);
|
|
|
|
memcpy(ce->sha1, sha1, 20);
|
|
memcpy(ce->name, arg3, len);
|
|
ce->ce_flags = htons(len);
|
|
ce->ce_mode = create_ce_mode(mode);
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
|
return add_cache_entry(ce, option);
|
|
}
|
|
|
|
static struct cache_file cache_file;
|
|
|
|
|
|
static void update_one(const char *path, const char *prefix, int prefix_length)
|
|
{
|
|
const char *p = prefix_path(prefix, prefix_length, path);
|
|
if (!verify_path(p)) {
|
|
fprintf(stderr, "Ignoring path %s\n", path);
|
|
return;
|
|
}
|
|
if (force_remove) {
|
|
if (remove_file_from_cache(p))
|
|
die("git-update-index: unable to remove %s", path);
|
|
return;
|
|
}
|
|
if (add_file_to_cache(p))
|
|
die("Unable to process file %s", path);
|
|
}
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
int i, newfd, entries, has_errors = 0, line_termination = '\n';
|
|
int allow_options = 1;
|
|
int read_from_stdin = 0;
|
|
const char *prefix = setup_git_directory();
|
|
int prefix_length = prefix ? strlen(prefix) : 0;
|
|
|
|
newfd = hold_index_file_for_update(&cache_file, get_index_file());
|
|
if (newfd < 0)
|
|
die("unable to create new cachefile");
|
|
|
|
entries = read_cache();
|
|
if (entries < 0)
|
|
die("cache corrupted");
|
|
|
|
for (i = 1 ; i < argc; i++) {
|
|
const char *path = argv[i];
|
|
|
|
if (allow_options && *path == '-') {
|
|
if (!strcmp(path, "--")) {
|
|
allow_options = 0;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "-q")) {
|
|
quiet = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--add")) {
|
|
allow_add = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--replace")) {
|
|
allow_replace = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--remove")) {
|
|
allow_remove = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--unmerged")) {
|
|
allow_unmerged = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--refresh")) {
|
|
has_errors |= refresh_cache();
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--cacheinfo")) {
|
|
if (i+3 >= argc)
|
|
die("git-update-index: --cacheinfo <mode> <sha1> <path>");
|
|
if (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
|
|
die("git-update-index: --cacheinfo cannot add %s", argv[i+3]);
|
|
i += 3;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--info-only")) {
|
|
info_only = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--force-remove")) {
|
|
force_remove = 1;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "-z")) {
|
|
line_termination = 0;
|
|
continue;
|
|
}
|
|
if (!strcmp(path, "--stdin")) {
|
|
if (i != argc - 1)
|
|
die("--stdin must be at the end");
|
|
read_from_stdin = 1;
|
|
break;
|
|
}
|
|
if (!strcmp(path, "--ignore-missing")) {
|
|
not_new = 1;
|
|
continue;
|
|
}
|
|
die("unknown option %s", path);
|
|
}
|
|
update_one(path, prefix, prefix_length);
|
|
}
|
|
if (read_from_stdin) {
|
|
struct strbuf buf;
|
|
strbuf_init(&buf);
|
|
while (1) {
|
|
read_line(&buf, stdin, line_termination);
|
|
if (buf.eof)
|
|
break;
|
|
update_one(buf.buf, prefix, prefix_length);
|
|
}
|
|
}
|
|
if (active_cache_changed) {
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
|
commit_index_file(&cache_file))
|
|
die("Unable to write new cachefile");
|
|
}
|
|
|
|
return has_errors ? 1 : 0;
|
|
}
|