summaryrefslogtreecommitdiff
path: root/bash
diff options
context:
space:
mode:
authorRuixin <peter.bao@mail.utoronto.ca>2017-08-31 15:44:35 +0000
committerAtomic Bot <atomic-devel@projectatomic.io>2017-09-01 15:42:50 +0000
commitf07432d4cefcea7fb8c602b9ab78e83236127d8f (patch)
tree26e226ac0fa173deb7fae4fcff29586a204653ec /bash
parent12114ce3828936ed170adaa71a4c6e948764b127 (diff)
downloadostree-f07432d4cefcea7fb8c602b9ab78e83236127d8f.tar.gz
checkout: add an extra checkout_overwrite mode
This is for issue projectatomic/rpm-ostree#365, an extra option of overwrite mode is added to the checkout command so that when there is "non-directory" file already exist during checkout, the error will be handled. Some tests are added for regression Closes: #1116 Approved by: cgwalters
Diffstat (limited to 'bash')
-rw-r--r--bash/ostree1
1 files changed, 1 insertions, 0 deletions
diff --git a/bash/ostree b/bash/ostree
index f12d88b7..4ebe22c3 100644
--- a/bash/ostree
+++ b/bash/ostree
@@ -696,6 +696,7 @@ _ostree_checkout() {
--require-hardlinks -H
--union
--union-add
+ --disjoint-union
--user-mode -U
--whiteouts
"