diff options
| -rw-r--r-- | revision.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/revision.c b/revision.c index 5b56f0e921..a927d263a5 100644 --- a/revision.c +++ b/revision.c @@ -1443,16 +1443,17 @@ static int dotdot_missing(const char *arg, char *dotdot, static int handle_dotdot_1(const char *arg, char *dotdot, struct rev_info *revs, int flags, - int cant_be_filename) + int cant_be_filename, + struct object_context *a_oc, + struct object_context *b_oc) { const char *a_name, *b_name; struct object_id a_oid, b_oid; struct object *a_obj, *b_obj; - struct object_context a_oc, b_oc; unsigned int a_flags, b_flags; int symmetric = 0; unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM); - unsigned int oc_flags = GET_SHA1_COMMITTISH; + unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH; a_name = arg; if (!*a_name) @@ -1466,8 +1467,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot, if (!*b_name) b_name = "HEAD"; - if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, &a_oc) || - get_sha1_with_context(b_name, oc_flags, b_oid.hash, &b_oc)) + if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) || + get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc)) return -1; if (!cant_be_filename) { @@ -1509,8 +1510,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot, b_obj->flags |= b_flags; add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags); add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags); - add_pending_object_with_mode(revs, a_obj, a_name, a_oc.mode); - add_pending_object_with_mode(revs, b_obj, b_name, b_oc.mode); + add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path); + add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path); return 0; } @@ -1518,16 +1519,24 @@ static int handle_dotdot(const char *arg, struct rev_info *revs, int flags, int cant_be_filename) { + struct object_context a_oc, b_oc; char *dotdot = strstr(arg, ".."); int ret; if (!dotdot) return -1; + memset(&a_oc, 0, sizeof(a_oc)); + memset(&b_oc, 0, sizeof(b_oc)); + *dotdot = '\0'; - ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename); + ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename, + &a_oc, &b_oc); *dotdot = '.'; + free(a_oc.path); + free(b_oc.path); + return ret; } @@ -1540,7 +1549,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi int local_flags; const char *arg = arg_; int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME; - unsigned get_sha1_flags = 0; + unsigned get_sha1_flags = GET_SHA1_RECORD_PATH; flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM; @@ -1591,7 +1600,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi } if (revarg_opt & REVARG_COMMITTISH) - get_sha1_flags = GET_SHA1_COMMITTISH; + get_sha1_flags |= GET_SHA1_COMMITTISH; if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc)) return revs->ignore_missing ? 0 : -1; @@ -1599,7 +1608,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi verify_non_filename(revs->prefix, arg); object = get_reference(revs, arg, sha1, flags ^ local_flags); add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags); - add_pending_object_with_mode(revs, object, arg, oc.mode); + add_pending_object_with_path(revs, object, arg, oc.mode, oc.path); + free(oc.path); return 0; } |