mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 16:56:43 +02:00
Code

read-tree --reset -u fix. 

The previous commit makes -u to mean "I do want to remove the
local changes, just update it from the read tree" only for
one-way merge.  It makes sense to have it depend on the
"--reset" flag instead.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2006-05-15 08:09:31 -07:00 committed by Junio C Hamano
parent 613f02739a
commit 6d6776cb49
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
read-tree.c
View File

@ -12,6 +12,7 @@
#include <sys/time.h>
#include <signal.h>
static int reset = 0;
static int merge = 0;
static int update = 0;
static int index_only = 0;
@ -416,6 +417,10 @@ static void verify_uptodate(struct cache_entry *ce)
return;
errno = 0;
}
if (reset) {
ce->ce_flags |= htons(CE_UPDATE);
return;
}
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);
@ -686,9 +691,12 @@ static int oneway_merge(struct cache_entry **src)
if (!a)
return deleted_entry(old, NULL);
if (old && same(old, a)) {
struct stat st;
if (lstat(old->name, &st) || ce_match_stat(old, &st, 1))
old->ce_flags |= htons(CE_UPDATE);
if (reset) {
struct stat st;
if (lstat(old->name, &st) ||
ce_match_stat(old, &st, 1))
old->ce_flags |= htons(CE_UPDATE);
}
return keep_entry(old);
}
return merged_entry(a, NULL);
@ -722,7 +730,7 @@ static struct cache_file cache_file;
int main(int argc, char **argv)
{
int i, newfd, reset, stage = 0;
int i, newfd, stage = 0;
unsigned char sha1[20];
merge_fn_t fn = NULL;