]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

doc/sample_hooks/: Cleanups
authorRichard Hartmann <richih@debian.org>
Sat, 8 Feb 2014 16:00:47 +0000 (17:00 +0100)
committerRichard Hartmann <richih@debian.org>
Sat, 8 Feb 2014 16:00:47 +0000 (17:00 +0100)
doc/sample_hooks/post-merge-unclobber
doc/sample_hooks/pre-merge-unclobber

index 017a13fc50dcc0484f60497f7409cac8c3d07769..23c757c08432f46f01ec07ba71fc1cb887378ad4 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # This finds objects that the pre-merge script moved out of the way to
 #!/bin/sh
 
 # This finds objects that the pre-merge script moved out of the way to
-# avoid conflicts when running git clone and moves them back to their
-# original places. The result is that the git repository gets checked out
-# and the extant objects end up back in the working directory. Git now
-# sees these as un-staged changes to the working branch and you can deal
-# with them by adding them or reverting.
+# avoid conflicts when running `vcsh clone` and moves them back to their
+# original places. The result is that the Git repository gets checked out
+# without error and the pre-existing files end up back in the working
+# directory. Git and thus vcsh now see these as un-staged changes to the
+# working branch and you can deal with them as usual.
 
 find -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \;
 
 find -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \;
index 93a731908f08e8b75a95b1569aea69061a3bec21..52610962e611b9bafde5c3fe5f2f70423ed91c39 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 #!/bin/sh
 
-# This code does amost exactly what the native VCSH sanity checking code
-# does except that on finding a potential merge conflict, it moves the 
-# extant object out of the way temporarily. The merge then happens cleanly
-# as far as git knows, and a post-merge hook can figure out what to do with
-# the extant versions of the objects.
+# This code does amost exactly what the native vcsh sanity checking code
+# does except that on finding a potential merge conflict, it moves existing
+# files out of the way temporarily. Merging (part of `vcsh clone`) happens
+# cleanly, and a post-merge hook can be used to figure out what to do with
+# the now-renamed files.
 
 for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
        [ -e "$object" ] && mv "$object" "$object.vcsh-unclobber" 
 
 for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
        [ -e "$object" ] && mv "$object" "$object.vcsh-unclobber"