From 3ab8dd96d5500b0c3cc70c4f87487a2e7704b15f Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Fri, 6 Feb 2015 14:45:04 -0800 Subject: [PATCH] bzr fast-export: add explicit --plain Although the --plain option appears to currently be the default apparently it will not be so in the future so ask for it explicitly to remain compatible with Git. --- jobd/update.sh | 2 +- taskd/clone.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobd/update.sh b/jobd/update.sh index 789dae9..7e6701b 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -48,7 +48,7 @@ git_bzr_fetch() ( exec 4>&3 3>&1 1>&4 4>&- { _e1=0 - bzr fast-export \ + bzr fast-export --plain \ --export-marks="$(pwd)/dfe-marks" \ --import-marks="$(pwd)/dfe-marks" "$1" 3>&- || _e1=$? echo $_e1 >&3 diff --git a/taskd/clone.sh b/taskd/clone.sh index f1291da..b49e49d 100755 --- a/taskd/clone.sh +++ b/taskd/clone.sh @@ -45,7 +45,7 @@ git_bzr_fetch() ( exec 4>&3 3>&1 1>&4 4>&- { _e1=0 - bzr fast-export \ + bzr fast-export --plain \ --export-marks="$(pwd)/bfe-marks" "$1" 3>&- || _e1=$? echo $_e1 >&3 } | \ -- 2.11.4.GIT