TheLocehiliosan / yadm

Yet Another Dotfiles Manager
https://yadm.io/
GNU General Public License v3.0
4.91k stars 176 forks source link

Convert existing bare repo to yadm #443

Closed MMitsialis closed 1 year ago

MMitsialis commented 1 year ago

This question is about

Describe your question

I have an existing Bare repo containing me dotfiles on windows. My Windows home directory is the bare repo working directory. I have a git alias to manage which ignore config='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}'

I have followed the 'Getting Started", the `yadm clone ' , and clone the "master" branch. when I try to switch to the currently active branch, a list of files is dsiplay and ends with "Aborting"

Question:

Git Config for current Bare Repo

Some personal information obsufcated

diff.astextplain.textconv=astextplain
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
http.sslbackend=schannel
core.autocrlf=input
core.fscache=true
core.symlinks=false
pull.rebase=false
credential.helper=manager-core
credential.helper=
credential.helper=C:/Program\ Files\ \(x86\)/Git\ Credential\ Manager\ Core/git-credential-manager-core.exe
credential.https://dev.azure.com.usehttppath=true
init.defaultbranch=master
credential.helper=manager-core
core.editor="C:\Users\MarcM\AppData\Local\Programs\Microsoft VS Code\bin\code" --wait
core.excludesfile=C:\Users\MarcM/.config/git/.gitignore_global
user.name=Marc Mitsialis
user.email=XXXX@XXX
alias.l=log --relative-date --decorate --graph --abbrev-commit
alias.ll=log --relative-date --decorate --all --graph --abbrev-commit
alias.resetorigin=!git fetch origin && git reset --hard origin/master && git clean -f -d
alias.resetupstream=!git fetch upstream && git reset --hard upstream/master && git clean -f -d
diff.tool=vscode
difftool.vscode.cmd=code --wait --diff $LOCAL $REMOTE
format.pretty=format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%aN%Cred%d %Creset%s
include.path=~/.local/.gitconfig
merge.tool=vscode
mergetool.vscode.cmd=code --wait $MERGED
pager.branch=false
core.repositoryformatversion=0
core.filemode=false
core.bare=true
core.symlinks=false
core.ignorecase=true
remote.origin.url=https://github.com/XXXX/XXXX.git
status.showuntrackedfiles=no
user.name=Marc Mitsialis
user.email=XXXX@XXXX
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.2021-01.remote=origin
branch.2021-01.merge=refs/heads/2021-01

Initial Clone using yadm

MarcM@Caladan MINGW64 ~
$ yadm clone https://github.com/xxxx/xxxxx.git
Cloning into 'repo.git'...
remote: Enumerating objects: 781, done.
remote: Counting objects: 100% (97/97), done.
remote: Compressing objects: 100% (50/50), done.
remote: Total 781 (delta 37), reused 78 (delta 28), pack-reused 684
Receiving objects: 100% (781/781), 2.32 MiB | 1.39 MiB/s, done.
Resolving deltas: 100% (308/308), done.
**NOTE**
  Local files with content that differs from the ones just
  cloned were found in /c/Users/MarcM. They have been left
  unmodified.

  Please review and resolve any differences appropriately.
  If you know what you're doing, and want to overwrite the
  tracked files, consider 'yadm checkout "/c/Users/MarcM"'.

Attempt to checkout my active branch

 yadm checkout 2021-01
error: Your local changes to the following files would be overwritten by checkout:
        .bashrc
        .config/git/gitk
        .gitconfig
        AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by checkout:
        .bash_aliases
        .bash_profile
        .gitignore
        .wslconfig
        AppData/Roaming/Notepad++/Compare.ini
        AppData/Roaming/Notepad++/XMLToolsExt.ini
        AppData/Roaming/Notepad++/contextMenu.xml
        AppData/Roaming/Notepad++/functionList.xml
        AppData/Roaming/Notepad++/functionList/asm.xml
        AppData/Roaming/Notepad++/functionList/autoit.xml
        AppData/Roaming/Notepad++/functionList/baanc.xml
        AppData/Roaming/Notepad++/functionList/bash.xml
        AppData/Roaming/Notepad++/functionList/batch.xml
        AppData/Roaming/Notepad++/functionList/c.xml
        AppData/Roaming/Notepad++/functionList/cobol-free.xml
        AppData/Roaming/Notepad++/functionList/cobol.xml
        AppData/Roaming/Notepad++/functionList/cpp.xml
        AppData/Roaming/Notepad++/functionList/cs.xml
        AppData/Roaming/Notepad++/functionList/ini.xml
        AppData/Roaming/Notepad++/functionList/inno.xml
        AppData/Roaming/Notepad++/functionList/java.xml
        AppData/Roaming/Notepad++/functionList/javascript.js.xml
        AppData/Roaming/Notepad++/functionList/krl.xml
        AppData/Roaming/Notepad++/functionList/nsis.xml
        AppData/Roaming/Notepad++/functionList/overrideMap.xml
        AppData/Roaming/Notepad++/functionList/perl.xml
        AppData/Roaming/Notepad++/functionList/php.xml
        AppData/Roaming/Notepad++/functionList/powershell.xml
        AppData/Roaming/Notepad++/functionList/python.xml
        AppData/Roaming/Notepad++/functionList/ruby.xml
        AppData/Roaming/Notepad++/functionList/sinumerik.xml
        AppData/Roaming/Notepad++/functionList/sql.xml
        AppData/Roaming/Notepad++/functionList/universe_basic.xml
        AppData/Roaming/Notepad++/functionList/vhdl.xml
        AppData/Roaming/Notepad++/functionList/xml.xml
        AppData/Roaming/Notepad++/langs.xml
        AppData/Roaming/Notepad++/plugins/Config/AutoEolFormat.ini
        AppData/Roaming/Notepad++/plugins/Config/ComparePlugin.ini
        AppData/Roaming/Notepad++/plugins/Config/CsvQuery.ini
        AppData/Roaming/Notepad++/plugins/Config/CsvQuery/querycache.txt
        AppData/Roaming/Notepad++/plugins/Config/CustomizeToolbar.btn
        AppData/Roaming/Notepad++/plugins/Config/CustomizeToolbar.dat
        AppData/Roaming/Notepad++/plugins/Config/DSpellCheck.ini
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/af_ZA.aff
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/af_ZA.dic
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/en_GB.aff
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/en_GB.dic
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/en_ZA.aff
        AppData/Roaming/Notepad++/plugins/Config/Hunspell/en_ZA.dic
        AppData/Roaming/Notepad++/plugins/Config/MarkdownViewerPlusPlus.ini
        AppData/Roaming/Notepad++/plugins/Config/NppFTP/Certificates.xml
        AppData/Roaming/Notepad++/plugins/Config/NppFTP/NppFTP.xml
        AppData/Roaming/Notepad++/plugins/Config/NppMarkdownPanel.ini
        AppData/Roaming/Notepad++/plugins/Config/Python Indent.ini
        AppData/Roaming/Notepad++/plugins/Config/SortAsc.bmp
        AppData/Roaming/Notepad++/plugins/Config/XBrackets.ini
        AppData/Roaming/Notepad++/plugins/Config/XMLTools.ini
        AppData/Roaming/Notepad++/plugins/Config/converter.ini
        AppData/Roaming/Notepad++/shortcuts.xml
        AppData/Roaming/Notepad++/stylers.xml
        AppData/Roaming/Notepad++/themes/Bespin.xml
        AppData/Roaming/Notepad++/themes/Black board.xml
        AppData/Roaming/Notepad++/themes/Choco.xml
        AppData/Roaming/Notepad++/themes/DansLeRuSH-Dark.xml
        AppData/Roaming/Notepad++/themes/Deep Black.xml
        AppData/Roaming/Notepad++/themes/Dracula.xml
        AppData/Roaming/Notepad++/themes/Hello Kitty.xml
        AppData/Roaming/Notepad++/themes/HotFudgeSundae.xml
        AppData/Roaming/Notepad++/themes/Mono Industrial.xml
        AppData/Roaming/Notepad++/themes/Monokai.xml
        AppData/Roaming/Notepad++/themes/MossyLawn.xml
        AppData/Roaming/Notepad++/themes/Navajo.xml
        AppData/Roaming/Notepad++/themes/Nord.xml
        AppData/Roaming/Notepad++/themes/Obsidian.xml
        AppData/Roaming/Notepad++/themes/Plastic Code Wrap.xml
        AppData/Roaming/Notepad++/themes/Ruby Blue.xml
        AppData/Roaming/Notepad++/themes/Solarized-light.xml
        AppData/Roaming/Notepad++/themes/Twilight.xml
        AppData/Roaming/Notepad++/themes/Vibrant Ink.xml
        AppData/Roaming/Notepad++/themes/Zenburn.xml
        AppD
Aborting
github-actions[bot] commented 1 year ago

This issue has been labeled as stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.

github-actions[bot] commented 1 year ago

This issue was closed because it has been labeled as stale for 7 days with no activity.