From 29146ef1d75adaf4d736c9a71491eff0b7fb3880 Mon Sep 17 00:00:00 2001 From: Tharre Date: Tue, 25 Oct 2016 20:16:26 +0200 Subject: Remove REDO_MAGIC handling code from handle_c() --- src/build.c | 13 ------------- tests/t0100-redo.t | 1 - 2 files changed, 14 deletions(-) diff --git a/src/build.c b/src/build.c index d601e42..9b24753 100644 --- a/src/build.c +++ b/src/build.c @@ -492,12 +492,6 @@ static int handle_c(dep_info *dep) { goto exit2; } - errno = 0; - long magic = strtol(ctx.fields[2], NULL, 10); - if (errno) { - retval = build_target(dep); - goto exit; - } FILE *targetfd = fopen(dep->target, "rb"); if (!targetfd) { @@ -513,13 +507,6 @@ static int handle_c(dep_info *dep) { } } - if (magic == atoi(getenv("REDO_MAGIC"))) { - /* magic number matches */ - fclose(targetfd); - retval = 1; - goto exit; - } - struct stat curr_st; if (sscanf(ctx.fields[1], "%lld.%ld", (long long*)&dep->ctime.tv_sec, &dep->ctime.tv_nsec) < 2) { diff --git a/tests/t0100-redo.t b/tests/t0100-redo.t index b0bad3d..cc86d1b 100755 --- a/tests/t0100-redo.t +++ b/tests/t0100-redo.t @@ -30,7 +30,6 @@ EOF test_expect_success "redo shortcuts" " echo "s1" > s && redo a && - sleep 1 && # TODO: remove this as soon as REDO_MAGIC is fixed echo "s2" > s && redo a " -- cgit v1.2.3-70-g09d2