summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDante Catalfamo2021-04-12 12:55:06 -0400
committerDante Catalfamo2021-04-12 12:55:06 -0400
commitedfd631e7ca373fc08900be957cdf5509e6364da (patch)
tree3aa9c5de2bfd92a8ca8cc83d444eda063d68019f
parent189c18ae592b3d9d32694b0bf01f29ad1725c80a (diff)
downloadblog-edfd631e7ca373fc08900be957cdf5509e6364da.tar.gz
blog-edfd631e7ca373fc08900be957cdf5509e6364da.tar.bz2
blog-edfd631e7ca373fc08900be957cdf5509e6364da.zip
freecad-git: finishing touches
-rw-r--r--content/posts/WIP-freecad-and-git/index.org35
1 files changed, 17 insertions, 18 deletions
diff --git a/content/posts/WIP-freecad-and-git/index.org b/content/posts/WIP-freecad-and-git/index.org
index c6d8d24..f2db847 100644
--- a/content/posts/WIP-freecad-and-git/index.org
+++ b/content/posts/WIP-freecad-and-git/index.org
@@ -1,24 +1,23 @@
#+TITLE: FreeCAD and Git
-#+DATE: 2021-03-23T01:23:58-04:00
+#+DATE: 2021-04-11T12:53:48-04:00
#+DRAFT: true
-#+DESCRIPTION:
-#+TAGS[]:
-#+KEYWORDS[]:
+#+DESCRIPTION: How to use git to efficiently store FreeCAD files
+#+TAGS[]: git freecad
+#+KEYWORDS[]: git freecad
#+SLUG:
#+SUMMARY:
-I've been working a lot with [[https://freecadweb.org/][FreeCAD]] recently since I got my 3D
-printer. It's been a mostly excellent experience, but I've run a
-couple issues.
+I've been working a lot with [[https://freecadweb.org/][FreeCAD]] since I got my 3D printer. It's
+been a mostly excellent experience, but I've run a couple issues.
-Between the MacOS version and Linux version of FreeCAD (both 0.19,
-maybe different builds?), and transferring files between machines
-using Nextcloud, a project that I'd been working on for a couple days
-became broken to the point where I could no longer modify the
-sketches, rendering it useless.
+Between the MacOS and Linux version of FreeCAD (both 0.19, maybe
+different builds?), and transferring files between machines using
+Nextcloud, a project that I'd been working on for a couple days became
+broken to the point where I could no longer modify the sketches,
+rendering it useless.
This has led me to find out how I can manage these files through
-version control like =git=.
+version control like [[https://git-scm.com/][=git=]].
It would seem that FreeCAD files are nothing more than zip files
containing text documents, which should make this rather easy.
@@ -29,10 +28,10 @@ when used together, result in an adequate solution.
The main component of this workaround is a great little script called
[[https://bitbucket.org/sippey/zippey/src/master/][zippey]], which allows git to efficiently store zip files using
-something called a [[https://git-scm.com/docs/gitattributes#_filter][filter attribute]].
+something called a [[https://git-scm.com/docs/gitattributes#_filter][=filter= attribute]].
The second isn't as much a tool as it is a snippet from a [[https://tante.cc/2010/06/23/managing-zip-based-file-formats-in-git/][blog post]]
-about diffing zip files using the [[https://git-scm.com/docs/gitattributes#_diff][=diff=]] attribute. By combining both
+about diffing zip files using the [[https://git-scm.com/docs/gitattributes#_diff][=diff= attribute]]. By combining both
these methods we can arrive at a pretty good method of handling
FreeCAD save data.
@@ -42,9 +41,9 @@ the website and user who created them, I'll be cloning it to
=~/src/bitbucket.org/sippey/zippey=.
Then I configure my =~/.gitconfig= to so that the =diff= and =filter=
-settings are used globally. I'll also setup a global git [[https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes][attributes]]
-file so that I don't need to set the association with =.FCStd= files
-in each repo individually.
+attribute settings are used globally. I'll also setup a global git
+[[https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes][attributes]] file so that I don't need to set the association with
+=.FCStd= files in each repo individually.
I add the following lines to my =~/.gitconfig=.