revert: add --ff option to allow fast forward when cherry-picking

diff --git a/path.c b/path.c
index e166d5380e47a7f6560f504de6550a508de1e170..d1fccbde7f5ba08ba9876b12e1dbabf87f44b4e9 100644 (file)
--- a/path.c
+++ b/path.c
@@ -336,7 +336,7 @@ char *enter_repo(char *path, int strict)
 
        if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&
            validate_headref("HEAD") == 0) {
-               setenv(GIT_DIR_ENVIRONMENT, ".", 1);
+               set_git_dir(".");
                check_repository_format();
                return path;
        }