From: Tom Clegg Date: Tue, 7 Oct 2014 02:16:56 +0000 (-0400) Subject: 3775: Update comment X-Git-Tag: 1.1.0~2122^2~2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/2453adf513632740bc8a29f4d8b52789f4d8cd62 3775: Update comment --- diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job index 4aecb0e812..d4c8949510 100755 --- a/sdk/cli/bin/crunch-job +++ b/sdk/cli/bin/crunch-job @@ -367,10 +367,11 @@ if (!defined $no_clear_tmp) { my $git_archive; if (!defined $git_dir && $Job->{'script_version'} =~ m{^/}) { - # If we're in user-land (i.e., not called from crunch-dispatch) - # script_version can be an absolute directory path, signifying we - # should work straight out of that directory instead of using a git - # commit. + # If script_version looks like an absolute path, *and* the --git-dir + # argument was not given -- which implies we were not invoked by + # crunch-dispatch -- we will use the given path as a working + # directory instead of resolving script_version to a git commit (or + # doing anything else with git). $ENV{"CRUNCH_SRC_COMMIT"} = $Job->{'script_version'}; $ENV{"CRUNCH_SRC"} = $Job->{'script_version'}; }