diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 23:55:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 23:55:36 (GMT) |
| commit | 7d43de925b2771d295d8fc4341b7bd544e2a74fa (patch) | |
| tree | 06cd429ed1ed04337eeaf23f6d72855fd94d3c0b /builtin | |
| parent | 01530432f73e7a29fbb9c4bc62aa88fba125ca7d (diff) | |
| parent | 172b6428d06ff4eb0812f087a497d50b6c878fe1 (diff) | |
| download | git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.zip git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.gz git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.bz2 | |
Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 9ec13f1..c24a7be 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -234,6 +234,24 @@ static void save_state(void) die("not a valid object: %s", buffer.buf); } +static void read_empty(unsigned const char *sha1, int verbose) +{ + int i = 0; + const char *args[7]; + + args[i++] = "read-tree"; + if (verbose) + args[i++] = "-v"; + args[i++] = "-m"; + args[i++] = "-u"; + args[i++] = EMPTY_TREE_SHA1_HEX; + args[i++] = sha1_to_hex(sha1); + args[i] = NULL; + + if (run_command_v_opt(args, RUN_GIT_CMD)) + die("read-tree failed"); +} + static void reset_hard(unsigned const char *sha1, int verbose) { int i = 0; @@ -985,7 +1003,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) die("%s - not something we can merge", argv[0]); update_ref("initial pull", "HEAD", remote_head->sha1, NULL, 0, DIE_ON_ERR); - reset_hard(remote_head->sha1, 0); + read_empty(remote_head->sha1, 0); return 0; } else { struct strbuf merge_names = STRBUF_INIT; |