#!/bin/sh
# This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014
+# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015
# For details, see LICENSE. To submit patches, you have to agree to
# license your code under the GNU GPL version 2 or later.
[ 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
}
list_tracked_by() {
- list_tracked $2
+ list_tracked '' $2
}
list_untracked() {
cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
fi
cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
- comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+ comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
}
pull() {
for VCSH_REPO_NAME in $(list); do
STATUS=$(status_helper $VCSH_REPO_NAME "$COLORING")
[ -n "$STATUS" -o -z "$VCSH_STATUS_TERSE" ] && echo "$VCSH_REPO_NAME:"
- [ -n "$STATUS" ] && echo "$STATUS"
+ [ -n "$STATUS" ] && echo "$STATUS"
[ -z "$VCSH_STATUS_TERSE" ] && echo
done
fi
status_helper() {
GIT_DIR=$VCSH_REPO_D/$1.git; export GIT_DIR
+ VCSH_GIT_OPTIONS=$2
use
remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
[ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
[ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
}
- git $2 status --short --untracked-files='no'
+ git ${VCSH_GIT_OPTIONS} status --short --untracked-files='no'
VCSH_COMMAND_RETURN_CODE=$?
}
}
which() {
- [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
- 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
- done | sort -u
+ output=$(for VCSH_REPO_NAME in $(list); do
+ 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
+ else
+ echo "$output"
+ fi
}
write_gitignore() {
:
elif [ x"$VCSH_COMMAND" = x'status' ]; then
if [ x"$2" = x'--terse' ]; then
- VCSH_STATUS_TERSE=1
- export VCSH_STATUS_TERSE
+ VCSH_STATUS_TERSE=1; export VCSH_STATUS_TERSE
shift
fi
VCSH_REPO_NAME=$2; export VCSH_REPO_NAME