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

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:

Merge pull request #149 from dottedmag/fix-test-git-22
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index ff256dad67e4ea03a313743853bcfab8c04f0832..c30b12d15edcb4bbc2b1dda41b67d3b47c9c5174 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -169,7 +169,7 @@ clone() {
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
-       git merge origin/"$VCSH_BRANCH"
+       git -c merge.ff=true merge origin/"$VCSH_BRANCH"
        hook post-merge
        hook post-clone
        retire
@@ -264,7 +264,7 @@ list_tracked_helper() {
 }
 
 list_tracked_by() {
-       list_tracked $2
+       list_tracked '' $2
 }
 
 list_untracked() {
@@ -426,9 +426,7 @@ use() {
 
 which() {
        output=$(for VCSH_REPO_NAME in $(list); do
-               for VCSH_FILE in $(get_files); do
-                       echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
-               done
+               get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /"
        done | sort -u)
        if [ -z "$output" ]; then
                fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1