diff options
| author | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2008-02-19 04:37:05 +0000 |
|---|---|---|
| committer | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2008-02-19 04:37:05 +0000 |
| commit | e999fef862ca10be258868e2ee402d1effd6350a (patch) | |
| tree | 93f01527c55de17f1ed7ebdef0fe54af0cdd4c87 | |
| parent | f60b9310c4d511eb90b63c4cf6fe6be8cd870b57 (diff) | |
Handle non-existing files when adding to the git repository
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@162 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | src/make.configuration.deps | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 36c7809..83c3ac9 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -281,10 +281,18 @@ $(TOP)/GIT-COMMIT-ID: $(TOP)/BUILD-ID $(TARBALL_DIR)/cactus-flesh-source.files $ echo "Formaline: Preparing git repository..." && \ $(GIT) rm --cached -r . > /dev/null 2>&1; \ echo "Formaline: Adding flesh to git repository..." && \ - cat $(TARBALL_DIR)/cactus-flesh-source.files | xargs -n 1 $(GIT) add; \ + xargs ls < $(TARBALL_DIR)/cactus-flesh-source.files \ + > $(TARBALL_DIR)/cactus-flesh-source.files2 2> /dev/null; \ + xargs $(GIT) add < $(TARBALL_DIR)/cactus-flesh-source.files2 && \ + rm $(TARBALL_DIR)/cactus-flesh-source.files2 && \ for thorn in $(notdir $(THORNS)); do \ echo "Formaline: Adding thorn $$thorn to git repository..." && \ - cat $(TARBALL_DIR)/cactus-thorn-source-$$thorn.files | xargs -n 1 $(GIT) add; \ + xargs ls < $(TARBALL_DIR)/cactus-thorn-source-$$thorn.files \ + > $(TARBALL_DIR)/cactus-thorn-source-$$thorn.files2 \ + 2> /dev/null; \ + xargs $(GIT) add \ + < $(TARBALL_DIR)/cactus-thorn-source-$$thorn.files2 && \ + rm $(TARBALL_DIR)/cactus-thorn-source-$$thorn.files2; \ done && \ true "Write source tree and create a commit" && \ echo "Formaline: Committing source tree to git repository..." && \ |