From 7ccdf5c70da886ba90e53b35f38003916136469c Mon Sep 17 00:00:00 2001
From: Aiqiao Yan <aiyan@microsoft.com>
Date: Fri, 10 Apr 2020 15:34:34 -0400
Subject: [PATCH] Rebase and rebuild
---
dist/restore/index.js | 6 +-----
dist/save/index.js | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/dist/restore/index.js b/dist/restore/index.js
index 4015484..21bdbe4 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -5041,12 +5041,8 @@ function createTar(archiveFolder, sourceDirectories) {
const args = [
"-cz",
"-f",
-<<<<<<< HEAD
- constants_1.CacheFilename,
- "-P",
-=======
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
->>>>>>> Fallback to GNU tar if BSD tar is unavailable
+ "-P",
"-C",
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
"--files-from",
diff --git a/dist/save/index.js b/dist/save/index.js
index 0762bfd..78623c7 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -5018,12 +5018,8 @@ function createTar(archiveFolder, sourceDirectories) {
const args = [
"-cz",
"-f",
-<<<<<<< HEAD
- constants_1.CacheFilename,
- "-P",
-=======
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
->>>>>>> Fallback to GNU tar if BSD tar is unavailable
+ "-P",
"-C",
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
"--files-from",