Lines 119-124
DEPEND="dev-vcs/git"
Link Here
|
119 |
# non bare repositories. This is useful if you can't operate with bare |
119 |
# non bare repositories. This is useful if you can't operate with bare |
120 |
# checkouts for some reason. |
120 |
# checkouts for some reason. |
121 |
|
121 |
|
|
|
122 |
# @ECLASS-VARIABLE: EGIT_FORCE_FETCH_UPDATE |
123 |
# @DEFAULT_UNSET |
124 |
# @DESCRIPTION: |
125 |
# If non-empty this variable forces the git update repo to use git fetch |
126 |
# no matter the repo type (bare/non bare). This is useful if you are using |
127 |
# a non bare repo and the remote tends to rebase the tracked branch with |
128 |
# conflicting commits, as git pull doesn't handle that situation gracefully. |
129 |
|
122 |
# @ECLASS-VARIABLE: EGIT_NOUNPACK |
130 |
# @ECLASS-VARIABLE: EGIT_NOUNPACK |
123 |
# @DEFAULT_UNSET |
131 |
# @DEFAULT_UNSET |
124 |
# @DESCRIPTION: |
132 |
# @DESCRIPTION: |
Lines 536-542
git-2_migrate_repository() {
Link Here
|
536 |
fi |
544 |
fi |
537 |
|
545 |
|
538 |
# set various options to work with both targets |
546 |
# set various options to work with both targets |
539 |
if [[ ${bare} ]]; then |
547 |
if [[ ${bare} || -n ${EGIT_FORCE_FETCH_UPDATE} ]]; then |
540 |
debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" |
548 |
debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" |
541 |
EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" |
549 |
EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" |
542 |
MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" |
550 |
MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" |