summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 04:38:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:18:17 (GMT)
commitcb93c19365760d939f05d9a3c2ef4499f0d5ce16 (patch)
tree7427fa1e25c61e2d647d8cbf314289d0616d021c /apply.c
parentf7d24bbefb06c40f7738f471dda561ab45496d24 (diff)
downloadgit-cb93c19365760d939f05d9a3c2ef4499f0d5ce16.zip
git-cb93c19365760d939f05d9a3c2ef4499f0d5ce16.tar.gz
git-cb93c19365760d939f05d9a3c2ef4499f0d5ce16.tar.bz2
merge-one-file: use common as base, instead of emptiness.
Unlike the previous round that merged the path added differently in each branches using emptiness as the base, compute a common version and use it as input to 'merge' program. This would show the resulting (still conflicting) file left in the working tree as: common file contents... <<<<<< FILENAME version from our branch... ====== version from their branch... >>>>>> .merge_file_XXXXXX more common file contents... when both sides added similar contents. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index cf8aa87..472bcdc 100644
--- a/apply.c
+++ b/apply.c
@@ -23,6 +23,7 @@ static int numstat = 0;
static int summary = 0;
static int check = 0;
static int apply = 1;
+static int no_add = 0;
static int show_index_info = 0;
static int line_termination = '\n';
static const char apply_usage[] =
@@ -1112,8 +1113,10 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
break;
/* Fall-through for ' ' */
case '+':
- memcpy(new + newsize, patch + 1, plen);
- newsize += plen;
+ if (*patch != '+' || !no_add) {
+ memcpy(new + newsize, patch + 1, plen);
+ newsize += plen;
+ }
break;
case '@': case '\\':
/* Ignore it, we already handled it */
@@ -1710,6 +1713,10 @@ int main(int argc, char **argv)
excludes = x;
continue;
}
+ if (!strcmp(arg, "--no-add")) {
+ no_add = 1;
+ continue;
+ }
if (!strcmp(arg, "--stat")) {
apply = 0;
diffstat = 1;