Browse Source

revision.c "..B" syntax: constness fix

The earlier change to make "..B" to mean "HEAD..B" (aka ^HEAD B)
has constness gotcha GCC complains.  Fix it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
0c8b106b02
  1. 9
      revision.c

9
revision.c

@ -641,14 +641,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch @@ -641,14 +641,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
dotdot = strstr(arg, "..");
if (dotdot) {
unsigned char from_sha1[20];
char *next = dotdot + 2;
char *this = arg;
static const char HEAD[] = "HEAD";
const char *next = dotdot + 2;
const char *this = arg;
*dotdot = 0;
if (!*next)
next = HEAD;
next = "HEAD";
if (dotdot == arg)
this = HEAD;
this = "HEAD";
if (!get_sha1(this, from_sha1) &&
!get_sha1(next, sha1)) {
struct commit *exclude;

Loading…
Cancel
Save