Differences

This shows you the differences between two versions of the page.

--- howto:git [2021/12/26 11:56] – va7fi
+++ howto:git [2021/12/26 12:26] (current) – [Test Scenarios] va7fi
@@ Line 2: / Line 2: @@
 ===== Test Scenarios =====
 Summary:
-  * When cloning from remote to local, ''www-data'' group ownership is not preserved.
+  * When cloning from remote to local or pushing from local to remote, ''www-data'' group ownership and ''770'' permissions are not preserved.
-  * When pushing local changes to remote, need to checkout a different branch on remote first, and permissions are not preserved.
+  * When pushing local changes to remote, the remote master can't be checkout out.
+References:
+  * [[https://stackoverflow.com/questions/3207728/retaining-file-permissions-with-git |stackoverflow]] question about permissions.
+  * Using [[https://githooks.com/ |git hooks]] to run pre- and post- scripts to fix permissions.
 ==== Initial Cloning ====
   * Create two files in a ''remote'' folder to simulate the wiki install on the server.
@@ Line 41: / Line 44: @@
 </code>
-  * But the ''www-data'' group ownership wasn't preserved:<code bash>
+  * But the ''www-data'' group ownership and the 770 permissions weren't preserved:<code bash>
 ~/gittest/local$ ls -l
 total 24
@@ Line 48: / Line 51: @@
 </code>
-  * Change the group back to ''www-data'':<code bash>
+  * Change the group back to ''www-data'' and permissions back to 770:<code bash>
-sudo chgrp www-data *
+sudo chgrp www-data *; chmod 770 *
 ls -l
 total 24
--rwxrwxr-x 1 ptruchon www-data 26 Dec 26 10:24 file1.txt
+-rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:24 file1.txt
--rwxrwxr-x 1 ptruchon www-data 26 Dec 26 10:24 file2.txt
+-rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:24 file2.txt
 </code>
@@ Line 97: / Line 100: @@
 ==== Push Changes to Remote ====
-  * Try to push changes to remote while master is still checked out on remote:<code bash>
+  * Attempting to push changes to remote while master is still checked out on remote doesn't work:<code bash>
 ~/gittest/local$ git push origin master
 Enumerating objects: 5, done.
@@ Line 124: / Line 127: @@
 </code>
-  * Checkout a temporary branch from remote:<code bash>
+  * Workaround is to checkout a temporary branch on remote:<code bash>
 ~/gittest/remote$ git checkout -b tmp
 Switched to a new branch 'tmp'
 </code>
-  * Push changes to remote while tmp is checked out on remote:<code bash>
+  * Then push the local changes to remote:<code bash>
 ~/gittest/local$ git push origin master
 Enumerating objects: 5, done.
@@ Line 160: / Line 163: @@
     initial commit on remote
+</code>
+  * On remote, checkout master and delete the temporary branch<code bash>
+~/gittest/remote$ git checkout master; git branch -d tmp
+Switched to branch 'master'
+Deleted branch tmp (was 0e5ccde).
+</code>
+  * Status and log both look good:<code bash>
+git status
+On branch master
+nothing to commit, working tree clean
+git log
+commit b7d91058fed9fe64c96525a3d0bef56c682ade68 (HEAD -> master)
+Author: Patrick Truchon <patoo@rbox.me>
+Date:   Sun Dec 26 10:45:41 2021 -0800
+    changed file1.txt from local
+commit 0e5ccdedd1c9188996aadad3a8e2be5a319ab789
+Author: Patrick Truchon <patoo@rbox.me>
+Date:   Sun Dec 26 10:21:24 2021 -0800
+    initial commit on remote
+</code>
+  * But group ownership of the modified file wasn't preserved<code bash>
+~/gittest/remote$ ls -l
+total 24
+-rwxrwxr-x 1 ptruchon ptruchon 50 Dec 26 12:01 file1.txt
+-rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:20 file2.txt
 </code>