Sublime Forum

All the files in my repository are shown as new files

#1

When I open sublime merge in my repo all the files are shown as Adds. Git doesn’t show any modified files.

And apparently I can’t attach a .log file to the post.

0 Likes
SublimeMerge: Ignoring global git config, at least its excludeFiles
#2

Here is the log:

=== App Version Information ===
Build: 1055

=== Git Version Information ===
Using Git: git
git version 2.19.0.444.g18242da7ef-goog

=== Browse Page Information ===
HEAD: 225628fe77625a24b88f42377b9404df0aca5fb2
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0

=== Git Status Information ===

=== Our Status Information ===
A  apache/apache-conf
A  apache/apache-prod-conf
A  apache/autotest.wsgi
A  apache/conf/afe-directives
A  apache/conf/all-directives
A  apache/conf/apache-conf
A  apache/conf/cgi-directives
A  apache/conf/django-directives
A  apache/conf/embedded-spreadsheet-directives
A  apache/conf/embedded-tko-directives
A  apache/conf/gwt-directives
A  apache/conf/logging-directives
A  apache/conf/moblab-setup-directives
A  apache/conf/new-tko-directives
A  apache/conf/site-directives
A  apache/conf/site-misc-directives
A  apache/conf/site-sso-directives
A  apache/conf/tko-directives
A  apache/drone-conf
A  apache/www/afe/AfeClient.html
A  apache/www/favicon.ico
A  apache/www/index.html
A  bin/abort_suite_skylab
A  bin/atest
... 10,000 Lines removed
A  venv/pytest.ini
A  venv/requirements.txt
A  venv/skylab_staging/__init__.py
A  venv/skylab_staging/conftest.py
A  venv/skylab_staging/errors.py
A  venv/skylab_staging/swarming.py
A  venv/skylab_staging/test_push.py
A  venv/skylab_staging/test_push_unittest.py
A  venv/skylab_suite/README.md
A  venv/skylab_suite/__init__.py
A  venv/skylab_suite/cmd/__init__.py
A  venv/skylab_suite/cmd/abort_suite_skylab.py
A  venv/skylab_suite/cmd/run_suite_skylab.py
A  venv/skylab_suite/cros_suite.py
A  venv/skylab_suite/errors.py
A  venv/skylab_suite/pytest.ini
A  venv/skylab_suite/suite_parser.py
A  venv/skylab_suite/suite_runner.py
A  venv/skylab_suite/suite_tracking.py
A  venv/skylab_suite/swarming_lib.py
A  venv/skylab_suite/swarming_lib_unittest.py

=== Git Config Information ===
alias.diffadd=!cd "$GIT_PREFIX"; ~/bin/diffadd
alias.stash-index=!f() { git commit -m _stash --no-verify && git stash && git reset HEAD^ && git stash save $1 && git stash pop stash@{1}; }; f
alias.stash-rename=!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git stash store -m "$2" $rev; }; _
alias.xl=log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' -10
branch.errors.merge=refs/heads/master
branch.errors.remote=cros
color.ui=true
core.autocrlf=false
core.filemode=true
core.repositoryformatversion=0
diff.tool=meld
difftool.diffmerge.cmd=diffmerge "$LOCAL" "$REMOTE"
difftool.pdiff.cmd=imgdiff "$LOCAL" "$REMOTE"
filter.lfs.smudge=git-lfs smudge --skip -- %f
help.autocorrect=1
http.cookiefile=/usr/local/home/xxxxxx/.gitcookies
include.path=/usr/share/git-core/config
merge.tool=meld
mergetool.diffmerge.cmd=diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
mergetool.diffmerge.trustexitcode=true
mergetool.keepbackup=false
mergetool.prompt=false
protocol.persistent-https.allow=always
protocol.rpc.allow=always
protocol.sso.allow=always
protocol.version=2
push.default=simple
remote.cros.fetch=+refs/heads/*:refs/remotes/cros/*
remote.cros.projectname=chromiumos/third_party/autotest
remote.cros.review=https://chromium-review.googlesource.com
remote.cros.url=https://chromium.googlesource.com/chromiumos/third_party/autotest
submodule.repolike=true
url.https://github.com/.insteadof=git://github.com/
user.email=xxxxxx
user.name=xxxxxx

=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /usr/local/home/xxxxxx/git/config
Using config path: /usr/local/home/xxxxxx/.gitconfig
Using config path: /usr/local/home/xxxxxx/chromiumos/src/third_party/autotest/files/.git/config

Our config output is identical to the Git config output

=== Git Attributes Information ===
git check_attr --all output

=== Our Modified Files Newline Normalisation and EOL Information ===
0 Likes