diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:41 -0700 |
| commit | ea56a7ed971f3bd547abb16a3cb9a41c00133c85 (patch) | |
| tree | 774e0039fb71f74ed612014d36ddd50c6014838a /builtin | |
| parent | Merge branch 'js/merge-rr-fix' (diff) | |
| parent | merge-tree: fix where two branches share no changes (diff) | |
| download | tgif-ea56a7ed971f3bd547abb16a3cb9a41c00133c85.tar.xz | |
Merge branch 'wp/merge-tree-fix'
* wp/merge-tree-fix:
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index fc00d794d6..9b25ddc979 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -60,6 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size) { enum object_type type; struct blob *base, *our, *their; + const char *path = entry->path; if (!entry->stage) return read_sha1_file(entry->blob->object.sha1, &type, size); @@ -76,7 +77,7 @@ static void *result(struct merge_list *entry, unsigned long *size) their = NULL; if (entry) their = entry->blob; - return merge_file(entry->path, base, our, their, size); + return merge_file(path, base, our, their, size); } static void *origin(struct merge_list *entry, unsigned long *size) |