summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-30 03:41:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-30 03:41:37 (GMT)
commitce4a706388bd26a3f897bb41a397113f1076ffc6 (patch)
tree76548ea5eaa5a478ac7882a0b77d944e12bc727f /revision.c
parent384e99a4a99820c34fe3600b2aad3f0185dd43db (diff)
downloadgit-ce4a706388bd26a3f897bb41a397113f1076ffc6.zip
git-ce4a706388bd26a3f897bb41a397113f1076ffc6.tar.gz
git-ce4a706388bd26a3f897bb41a397113f1076ffc6.tar.bz2
revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
For consistency reasons, we should probably allow that to be written as just "..branch", the same way we can write "branch.." to mean "everything in HEAD but not in "branch". Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/revision.c b/revision.c
index 745b0d2..2cda7e0 100644
--- a/revision.c
+++ b/revision.c
@@ -642,14 +642,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (dotdot) {
unsigned char from_sha1[20];
char *next = dotdot + 2;
+ char *this = arg;
+ static const char HEAD[] = "HEAD";
*dotdot = 0;
if (!*next)
- next = "HEAD";
- if (!get_sha1(arg, from_sha1) && !get_sha1(next, sha1)) {
+ next = HEAD;
+ if (dotdot == arg)
+ this = HEAD;
+ if (!get_sha1(this, from_sha1) &&
+ !get_sha1(next, sha1)) {
struct commit *exclude;
struct commit *include;
- exclude = get_commit_reference(revs, arg, from_sha1, flags ^ UNINTERESTING);
+ exclude = get_commit_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
include = get_commit_reference(revs, next, sha1, flags);
if (!exclude || !include)
die("Invalid revision range %s..%s", arg, next);