diff options
Diffstat (limited to 'add-patch.c')
| -rw-r--r-- | add-patch.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/add-patch.c b/add-patch.c index a86a92e164..8d770d203f 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1,5 +1,11 @@ #include "cache.h" #include "add-interactive.h" +#include "advice.h" +#include "alloc.h" +#include "editor.h" +#include "environment.h" +#include "gettext.h" +#include "object-name.h" #include "strbuf.h" #include "run-command.h" #include "strvec.h" @@ -414,7 +420,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) strvec_push(&args, /* could be on an unborn branch */ !strcmp("HEAD", s->revision) && - get_oid("HEAD", &oid) ? + repo_get_oid(the_repository, "HEAD", &oid) ? empty_tree_oid_hex() : s->revision); } color_arg_index = args.nr; @@ -483,7 +489,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) if (!eol) eol = pend; - if (starts_with(p, "diff ")) { + if (starts_with(p, "diff ") || + starts_with(p, "* Unmerged path ")) { complete_file(marker, hunk); ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1, file_diff_alloc); |