sublime_merge icon indicating copy to clipboard operation
sublime_merge copied to clipboard
verified publisher icon sublimehq

All repos files marked as Staged

Open sebastienandary opened this issue 5 years ago • 33 comments

Version info

  • OS: Windows 10 - build 20H2
  • Build: 2049

Description

When viewing (i.e. selecting) some commits, all repos files are marked as Changed. Some commits are corrects some aren't. At some point, before pulling newer commits, when HEAD pointed to those commits, all files in the repos were marked as Staged but this can't be reproducible since newer commits have been pulled.

The faulty commits seems to be detached from the git tree view, with false meta infos like wrong author and invalid date. Although the detailed commit infos view is correctly displaying those commit infos.

In the screen shot:

  1. Faulty commits appear at the bottom end of the git tree view. We can see the invalid date and note that author field is wrong (but hidden in the screenshot).
  2. This faulty commit is selected
  3. Commit infos are all correct: correct author and date.
  4. Changes corresponding to this commit are not correct (all files marked as Changed)

Steps to reproduce

Steps to reproduce the behavior:

  1. Open repository
  2. Checkout/select one of the faulty commits

Expected behavior

Left "File" colomn should display changed files list. Instead All files in repos are marked as changed. Author and date should match the commit info, instead 1 jan 1970 and the same incorrect author are displayed. All commits should be displayed as part of the git tree, instead all appears at the bottom view, and disconnected from the rest of the tree.

Screenshots

image

Debug Informations

=== App Version Information ===
Build: 2049

=== Git Version Information ===
Using Git: C:\Program Files\Sublime Merge\Git\cmd\git.exe (bundled)
git version 2.30.2.windows.1
PATH: C:\Program Files (x86)\SCE\Common\SceVSI-VS14\bin;C:\Program Files (x86)\SCE\ORBIS SDKs\5.000\host_tools\bin;C:\VulkanSDK\1.1.126.0\Bin;C:\Program Files (x86)\SCE\Common\SN-DBS\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\SCE\ORBIS\Tools\Publishing Tools\bin;C:\Program Files (x86)\SCE\ORBIS\Tools\Target Manager Server\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\Lua\5.1;C:\Program Files (x86)\Lua\5.1\clibs;C:\Program Files\Perforce\;C:\Program Files\Perforce;C:\Program Files\Common Files\Autodesk Shared\;C:\Program Files (x86)\Autodesk\Backburner\;C:\nvm;C:\Program Files\nodejs;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\RenderDoc;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C;C:\Program Files\Git\cmd;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\i7 8\AppData\Local\Programs\Python\Python37-32\Scripts\;C:\Users\i7 8\AppData\Local\Programs\Python\Python37-32\;C:\Users\i7 8\scoop\shims;C:\Users\i7 8\AppData\Local\Microsoft\WindowsApps;C:\nvm;C:\Program Files\nodejs;C:\bin\md5deep-4.4;C:\msys64\usr\bin;C:\Users\i7 8\AppData\Local\Microsoft\WindowsApps;C:\Program Files (x86)\Nmap;;C:\Users\i7 8\AppData\Local\Programs\Microsoft VS Code\bin

=== Browse Page Information ===
HEAD: 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0

=== Git Status Information ===
?? Project/VisualStudio/FBXConverter/x64/

=== Our Status Information ===
?? Project/VisualStudio/FBXConverter/x64/Debug/EntityLib.lib

=== Git Config Information ===
alias.tree=log --graph --decorate --pretty=oneline --abbrev-commit
branch.Guillaume/Clean/optim_for_tree_next.merge=refs/heads/Guillaume/Clean/optim_for_tree_next
branch.Guillaume/Clean/optim_for_tree_next.remote=origin
branch.LPVEmissive.merge=refs/heads/LPVEmissive
branch.LPVEmissive.remote=origin
branch.OutfiXes.merge=refs/heads/OutfiXes
branch.OutfiXes.remote=origin
branch.better-ride-spine.merge=refs/heads/better-ride-spine
branch.better-ride-spine.remote=origin
branch.entity-state-in-saves.merge=refs/heads/entity-state-in-saves
branch.entity-state-in-saves.remote=origin
branch.feat/better-reflection-schema.merge=refs/heads/feat/better-reflection-schema
branch.feat/better-reflection-schema.remote=origin
branch.feat/better-resources-debug.merge=refs/heads/feat/better-resources-debug
branch.feat/better-resources-debug.remote=origin
branch.feat/camera-commandline-parameters.merge=refs/heads/feat/camera-commandline-parameters
branch.feat/camera-commandline-parameters.remote=origin
branch.feat/change-scene.merge=refs/heads/feat/change-scene
branch.feat/change-scene.remote=origin
branch.feat/cinematic-events-forwarding.merge=refs/heads/feat/cinematic-events-forwarding
branch.feat/cinematic-events-forwarding.remote=origin
branch.feat/clanup-save.merge=refs/heads/feat/clanup-save
branch.feat/clanup-save.remote=origin
branch.feat/clean-blackboard.merge=refs/heads/feat/clean-blackboard
branch.feat/clean-blackboard.remote=origin
branch.feat/cleanup-spawn-pos.merge=refs/heads/feat/cleanup-spawn-pos
branch.feat/cleanup-spawn-pos.remote=origin
branch.feat/component-doc.merge=refs/heads/feat/component-doc
branch.feat/component-doc.remote=origin
branch.feat/creatures-in-saves.merge=refs/heads/feat/creatures-in-saves
branch.feat/creatures-in-saves.remote=origin
branch.feat/end-roots-in-saves.merge=refs/heads/feat/end-roots-in-saves
branch.feat/end-roots-in-saves.remote=origin
branch.feat/energy-probes-on-hotspots.merge=refs/heads/feat/energy-probes-on-hotspots
branch.feat/energy-probes-on-hotspots.remote=origin
branch.feat/entity-stepped-lifecycle.merge=refs/heads/feat/entity-stepped-lifecycle
branch.feat/entity-stepped-lifecycle.remote=origin
branch.feat/entityarchive-version.merge=refs/heads/feat/entityarchive-version
branch.feat/entityarchive-version.remote=origin
branch.feat/hotreload-history.merge=refs/heads/feat/hotreload-history
branch.feat/hotreload-history.remote=origin
branch.feat/load-save-loop.merge=refs/heads/feat/load-save-loop
branch.feat/load-save-loop.remote=origin
branch.feat/max-activation-level-in-gd.merge=refs/heads/feat/max-activation-level-in-gd
branch.feat/max-activation-level-in-gd.remote=origin
branch.feat/mc-cook-scenes-from-filter.merge=refs/heads/feat/mc-cook-scenes-from-filter
branch.feat/mc-cook-scenes-from-filter.remote=origin
branch.feat/minor-cleanups.merge=refs/heads/feat/minor-cleanups
branch.feat/minor-cleanups.remote=origin
branch.feat/missing-cooked-scene.merge=refs/heads/feat/missing-cooked-scene
branch.feat/missing-cooked-scene.remote=origin
branch.feat/multiple-fluid-component.merge=refs/heads/feat/multiple-fluid-component
branch.feat/multiple-fluid-component.remote=origin
branch.feat/new-entity-unified.merge=refs/heads/feat/new-entity-unified
branch.feat/new-entity-unified.remote=origin
branch.feat/pause-on-asserts.merge=refs/heads/feat/pause-on-asserts
branch.feat/pause-on-asserts.remote=origin
branch.feat/perf-stat-wed-cooker.merge=refs/heads/feat/perf-stat-wed-cooker
branch.feat/perf-stat-wed-cooker.remote=origin
branch.feat/proper-output-folder.merge=refs/heads/feat/proper-output-folder
branch.feat/proper-output-folder.remote=origin
branch.feat/quick-creature-change.merge=refs/heads/feat/quick-creature-change
branch.feat/quick-creature-change.remote=origin
branch.feat/regen-state-in-saves.merge=refs/heads/feat/regen-state-in-saves
branch.feat/regen-state-in-saves.remote=origin
branch.feat/scene-converter-archive.merge=refs/heads/feat/scene-converter-archive
branch.feat/scene-converter-archive.remote=origin
branch.feat/scene-cook-deps.merge=refs/heads/feat/scene-cook-deps
branch.feat/scene-cook-deps.remote=origin
branch.feat/scriptcomponent-anim-dependency.merge=refs/heads/feat/scriptcomponent-anim-dependency
branch.feat/scriptcomponent-anim-dependency.remote=origin
branch.feat/smaller-weds.merge=refs/heads/feat/smaller-weds
branch.feat/smaller-weds.remote=origin
branch.feat/veget-non-stencil-dynamic.merge=refs/heads/feat/veget-non-stencil-dynamic
branch.feat/veget-non-stencil-dynamic.remote=origin
branch.feat/warmup-failure.merge=refs/heads/feat/warmup-failure
branch.feat/warmup-failure.remote=origin
branch.feat/wed-hotreload.merge=refs/heads/feat/wed-hotreload
branch.feat/wed-hotreload.remote=origin
branch.feat/wed-with-creatures.merge=refs/heads/feat/wed-with-creatures
branch.feat/wed-with-creatures.remote=origin
branch.feat/wes-entity-dynamic-state.merge=refs/heads/feat/wes-entity-dynamic-state
branch.feat/wes-entity-dynamic-state.remote=origin
branch.feature/better-regen-veget-take2.merge=refs/heads/feature/better-regen-veget-take2
branch.feature/better-regen-veget-take2.remote=origin
branch.feature/better-regen-veget.merge=refs/heads/feature/better-regen-veget
branch.feature/better-regen-veget.remote=origin
branch.feature/extract-colliders-raw-mesh.merge=refs/heads/feature/extract-colliders-raw-mesh
branch.feature/extract-colliders-raw-mesh.remote=origin
branch.feature/fbxconvertor_scene_to_wed.merge=refs/heads/feature/fbxconvertor_scene_to_wed
branch.feature/fbxconvertor_scene_to_wed.remote=origin
branch.feature/make_VisualManager_thread_safe.merge=refs/heads/feature/make_VisualManager_thread_safe
branch.feature/make_VisualManager_thread_safe.remote=origin
branch.fix/animation-tree-events.merge=refs/heads/fix/animation-tree-events
branch.fix/animation-tree-events.remote=origin
branch.fix/beameffect-on-noncreatures.merge=refs/heads/fix/beameffect-on-noncreatures
branch.fix/beameffect-on-noncreatures.remote=origin
branch.fix/blackboard-assert.merge=refs/heads/fix/blackboard-assert
branch.fix/blackboard-assert.remote=origin
branch.fix/boids-default-entitystates.merge=refs/heads/fix/boids-default-entitystates
branch.fix/boids-default-entitystates.remote=origin
branch.fix/boids-simpler-res-loading.merge=refs/heads/fix/boids-simpler-res-loading
branch.fix/boids-simpler-res-loading.remote=origin
branch.fix/compil-orbis.merge=refs/heads/fix/compil-orbis
branch.fix/compil-orbis.remote=origin
branch.fix/default-value-in-arrays.merge=refs/heads/fix/default-value-in-arrays
branch.fix/default-value-in-arrays.remote=origin
branch.fix/energy-crook-net.merge=refs/heads/fix/energy-crook-net
branch.fix/energy-crook-net.remote=origin
branch.fix/energy-crook-radius.merge=refs/heads/fix/energy-crook-radius
branch.fix/energy-crook-radius.remote=origin
branch.fix/entitybuilder-transform.merge=refs/heads/fix/entitybuilder-transform
branch.fix/entitybuilder-transform.remote=origin
branch.fix/entitylib_with_union.merge=refs/heads/fix/entitylib_with_union
branch.fix/entitylib_with_union.remote=origin
branch.fix/fbx-converter-compil.merge=refs/heads/fix/fbx-converter-compil
branch.fix/fbx-converter-compil.remote=origin
branch.fix/fbxconverter-crash.merge=refs/heads/fix/fbxconverter-crash
branch.fix/fbxconverter-crash.remote=origin
branch.fix/fbxconverter-entitylib-update.merge=refs/heads/fix/fbxconverter-entitylib-update
branch.fix/fbxconverter-entitylib-update.remote=origin
branch.fix/fixes-trees-underground.merge=refs/heads/fix/fixes-trees-underground
branch.fix/fixes-trees-underground.remote=origin
branch.fix/fluid-precision-refactor.merge=refs/heads/fix/fluid-precision-refactor
branch.fix/fluid-precision-refactor.remote=origin
branch.fix/grc-hotreload.merge=refs/heads/fix/grc-hotreload
branch.fix/grc-hotreload.remote=origin
branch.fix/healer-perception.merge=refs/heads/fix/healer-perception
branch.fix/healer-perception.remote=origin
branch.fix/hotreload-new-entitygd.merge=refs/heads/fix/hotreload-new-entitygd
branch.fix/hotreload-new-entitygd.remote=origin
branch.fix/huge-wed-file.merge=refs/heads/fix/huge-wed-file
branch.fix/huge-wed-file.remote=origin
branch.fix/mc-compilation-missing-includes.merge=refs/heads/fix/mc-compilation-missing-includes
branch.fix/mc-compilation-missing-includes.remote=origin
branch.fix/mc-default-changelist.merge=refs/heads/fix/mc-default-changelist
branch.fix/mc-default-changelist.remote=origin
branch.fix/mc-errors-parsing.merge=refs/heads/fix/mc-errors-parsing
branch.fix/mc-errors-parsing.remote=origin
branch.fix/mc-ui-fixes.merge=refs/heads/fix/mc-ui-fixes
branch.fix/mc-ui-fixes.remote=origin
branch.fix/monsieurcuisinier-bat-subproc.merge=refs/heads/fix/monsieurcuisinier-bat-subproc
branch.fix/monsieurcuisinier-bat-subproc.remote=origin
branch.fix/open-entity-file.merge=refs/heads/fix/open-entity-file
branch.fix/open-entity-file.remote=origin
branch.fix/orbis-compil-recap.merge=refs/heads/fix/orbis-compil-recap
branch.fix/orbis-compil-recap.remote=origin
branch.fix/orbis-compil.merge=refs/heads/fix/orbis-compil
branch.fix/orbis-compil.remote=origin
branch.fix/orbis-fix.merge=refs/heads/fix/orbis-fix
branch.fix/orbis-fix.remote=origin
branch.fix/regen-waterfalls.merge=refs/heads/fix/regen-waterfalls
branch.fix/regen-waterfalls.remote=origin
branch.fix/remove-broken-editor.merge=refs/heads/fix/remove-broken-editor
branch.fix/remove-broken-editor.remote=origin
branch.fix/scene-node-graph-lazy.merge=refs/heads/fix/scene-node-graph-lazy
branch.fix/scene-node-graph-lazy.remote=origin
branch.fix/schema-stability.merge=refs/heads/fix/schema-stability
branch.fix/schema-stability.remote=origin
branch.fix/shapeshiftstatuegd.merge=refs/heads/fix/shapeshiftstatuegd
branch.fix/shapeshiftstatuegd.remote=origin
branch.fix/simple-phys-cook-ignorecase.merge=refs/heads/fix/simple-phys-cook-ignorecase
branch.fix/simple-phys-cook-ignorecase.remote=origin
branch.fix/souls-spawn.merge=refs/heads/fix/souls-spawn
branch.fix/souls-spawn.remote=origin
branch.fix/special-handling-gameentitystate.merge=refs/heads/fix/special-handling-gameentitystate
branch.fix/special-handling-gameentitystate.remote=origin
branch.fix/static-object-transforms.merge=refs/heads/fix/static-object-transforms
branch.fix/static-object-transforms.remote=origin
branch.fix/veget-hotreload.merge=refs/heads/fix/veget-hotreload
branch.fix/veget-hotreload.remote=origin
branch.fix/wed-creatures-orientation.merge=refs/heads/fix/wed-creatures-orientation
branch.fix/wed-creatures-orientation.remote=origin
branch.fix/wed-entities-id.merge=refs/heads/fix/wed-entities-id
branch.fix/wed-entities-id.remote=origin
branch.fix/wed-entityarchive.merge=refs/heads/fix/wed-entityarchive
branch.fix/wed-entityarchive.remote=origin
branch.fix/wed-handle-super.merge=refs/heads/fix/wed-handle-super
branch.fix/wed-handle-super.remote=origin
branch.fix/wed-hotreload.merge=refs/heads/fix/wed-hotreload
branch.fix/wed-hotreload.remote=origin
branch.fluid-damages-refactor.merge=refs/heads/fluid-damages-refactor
branch.fluid-damages-refactor.remote=origin
branch.jobbed-mesh-deformer-optim.merge=refs/heads/jobbed-mesh-deformer-optim
branch.jobbed-mesh-deformer-optim.remote=origin
branch.master.merge=refs/heads/master
branch.master.remote=origin
branch.mc-pfxmesh-error.merge=refs/heads/mc-pfxmesh-error
branch.mc-pfxmesh-error.remote=origin
branch.recast-computation-split.merge=refs/heads/recast-computation-split
branch.recast-computation-split.remote=origin
branch.refactor-animtools-enums.merge=refs/heads/refactor-animtools-enums
branch.refactor-animtools-enums.remote=origin
branch.revert-the-revert-of-load-save-loop.merge=refs/heads/master
branch.revert-the-revert-of-load-save-loop.remote=.
branch.standard/mountable.merge=refs/heads/standard/mountable
branch.standard/mountable.remote=origin
branch.verbose-physmesh-issue.merge=refs/heads/verbose-physmesh-issue
branch.verbose-physmesh-issue.remote=origin
color.branch=auto
color.diff=auto
color.interactive=true
color.status=auto
core.autocrlf=true
core.bare=false
core.editor=vim
core.excludesfile=C:\Users\i7 8\Documents\gitignore_global.txt
core.filemode=false
core.fscache=true
core.ignorecase=true
core.logallrefupdates=true
core.repositoryformatversion=0
core.symlinks=false
credential.helper=manager-core
credential.helperselector.selected=wincred
credential.https://dev.azure.com.usehttppath=true
diff.astextplain.textconv=astextplain
difftool.sourcetree.cmd='C:/Program Files/Perforce/p4merge.exe' "$LOCAL" "$REMOTE"
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
filter.lfs.smudge=git-lfs smudge -- %f
help.format=html
http.sslbackend=openssl
http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
include.path=C:/Program Files/Git/etc/gitconfig
mergetool.sourcetree.cmd='C:/Program Files/Perforce/p4merge.exe' "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
mergetool.sourcetree.trustexitcode=true
pack.packsizelimit=2g
pull.rebase=false
rebase.autosquash=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=https://github.com/XXXXXXXXXXXXXXX/XXXXXXXXXXXXXXX.git
submodule.Misc/TerraFormer/extern/GfxSampleFramework.active=true
submodule.Misc/TerraFormer/extern/GfxSampleFramework.url=https://github.com/XXXXXXXXXXXXXXX/GfxSampleFramework
user.email=XXXXXXXXXXXXXXX
user.name=XXXXXXXXXXXXXXX

=== Our Config Information ===
Git Config Path Information
Using config path: /C/ProgramData/Git/config
Using config path: /C/Program Files/Sublime Merge/Git/etc/gitconfig
Using config path: /C/Users/i7 8/.config/git/config
Using config path: /C/Users/i7 8/.gitconfig
Using config path: /C/Projet/Code/XXXXXXXXXXXXXXX/.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 ===

=== Our Modified Files Flag Information ===
Ignoring symlinks: 1

sebastienandary avatar Mar 16 '21 08:03 sebastienandary

Hi @sebastienandary,

Thanks for reporting this issue.

When you have a spare moment, could you perform the following:

  1. Open the command line
  2. Navigate to the repository with the issue
  3. Run the following command git show --stat 00fc9967e28990ede397dc3f8cc76b4bfd2137d7 and confirm there are not 5840 files changed

This is to rule out that the Git commit object itself isn't damaged.

Thanks, - Dylan

dpjohnst avatar Mar 16 '21 09:03 dpjohnst

Sure! Here is the output:

commit 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Author: xxxxxxxxxxxxxxxxxxxxxxxxxxx
Date:   Mon Mar 15 11:39:05 2021 +0100

    Add equal operator to EntityRef

 Projects/XXXX/Entity/EntityRef.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Thanks

sebastienandary avatar Mar 16 '21 09:03 sebastienandary

Hi @sebastienandary,

Thank you for the extra information - would you following the above steps again, but replace step 3 with: git cat-file -p 00fc9967e28990ede397dc3f8cc76b4bfd2137d7

Thanks, - Dylan

dpjohnst avatar Mar 16 '21 11:03 dpjohnst

Here is the output:

tree 10d9642723fe2bddcbe147400da1af269103e064
parent 1f9acf41db3c8180974f63b0a311d7aa7da1e199
author xxxxxxxxxxxxxxxxxxxxxxx 1615804745 +0100
committer xxxxxxxxxxxxxxxxxxxxxxx 1615807264 +0100

Add equal operator to EntityRef

sebastienandary avatar Mar 16 '21 11:03 sebastienandary

Hi @sebastienandary,

Thanks for the additional information - could you check whether you are able to navigate to the parent commit listed above?

  1. Open the command palette in Sublime Merge (Ctrl + P)
  2. SelectNavigate to Commit
  3. Enter the parent commit ID listed above
  4. Press the Enter key

If all goes well, it should select the parent commit in the commit graph.

Thanks, - Dylan

dpjohnst avatar Mar 16 '21 12:03 dpjohnst

I can't navigate to this commit, pressing enter does nothing and there is no completion for this ID. image

However, after running

git checkout 1f9acf41db3c8180974f63b0a311d7aa7da1e199

and then going back to HEAD using

git checkout -

in command line, I was able to navigate to this commit: image Edit: althrough I can select this commit in proposed command, selecting this and pressing Enter does nothing.

sebastienandary avatar Mar 16 '21 12:03 sebastienandary

Hi @sebastienandary,

Thanks for this - this has narrowed down the issue a lot.

Could you confirm whether you see any error messages in the Sublime Merge console (Ctrl + `)?

Kind regards, - Dylan

dpjohnst avatar Mar 17 '21 00:03 dpjohnst

There are ! Here is the whole log:

DPI mode: per-monitor v2
startup, version: 2049 windows x64
executable: /C/Program Files/Sublime Merge/sublime_merge.exe
application: /C/Program Files/Sublime Merge
working dir: /C/Program Files/Sublime Merge
packages path: /C/Users/i7 8/AppData/Roaming/Sublime Merge/Packages
state path: /C/Users/i7 8/AppData/Roaming/Sublime Merge/Local
zip path: /C/Users/i7 8/AppData/Roaming/Sublime Text 3/Installed Packages
zip path: /C/Program Files/Sublime Merge/Packages
zip path: /C/Users/i7 8/AppData/Roaming/Sublime Merge/Installed Packages
ignored_packages: ["Vintage"]
pre session restore time: 0.453718
loading repo /C/Projet/Code/XXXXX/.git
loading dictionary Packages/Language - English/en_US.dic
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
first paint time: 0.646718
loading repo /C/Projet/Code_master/XXXXXScripts/.git
head changed to 5fbfe2176cf7810783f577d711b5c4c7b470399b
loading repo /C/Projet/Code/XXXXX/.git
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
LOAD COMMIT FAILED!
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" reset
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" reset
Working dir: C:\Projet\Code\XXXXX
LOAD COMMIT FAILED!
head changed to df76df69dc95b52d2859b9675a06d106cca590e1
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Working dir: C:\Projet\Code\XXXXX
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout fix/missing-serialization
Working dir: C:\Projet\Code\XXXXX
head changed to df76df69dc95b52d2859b9675a06d106cca590e1
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" stash pop stash@{0}
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout fix/missing-serialization
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Data/MoveCapacityData.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[MoveCapacityData] add getter for serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to a4e332e2e6d7fe78ac01a32234b7f903db476d73
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Actor/ActorEnums.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Data/AbilityData.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Data/AbilityData.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[AbilityData] add getter for serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to a55ac8ee0edb30afc183c7229830ab435522064d
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Music/ShowdownMusic.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Music/ShowdownMusic.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[ShowdownMusic] add getter for  serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 3188dbeb6acda2a0d3e18e7bd101dba83ffc2944
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2318005579.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_220426535.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2816845203.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_4046617099.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2142239160.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[OutfitGD] add factionId getter for serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 42981009b17060af31f520bf555e1c6afb48d923
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2734831864.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_423228465.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1970920474.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[OutfitGD] add getter for serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 27df22e0df79084ffcdf63543894241e41c069ac
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3609308519.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2141626435.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3599313020.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3208005599.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1492399462.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_4240546270.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1416184015.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[OutfitGD] add missing initialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 50850318431c92fed75c5fea0f2c7790a1045adc
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout -- Projects/XXXXX/Script/XXXXXXXXXXXXXXX.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" --version
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" status --short
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" config --list
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" check-attr --all Project/VisualStudio/FBXConverter/x64/Debug/EntityLib.lib
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" check-attr --all Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 7117fa6735613799e306b2888cfe3199602854e6
Working dir: C:\Projet\Code\XXXXX
head changed to 7117fa6735613799e306b2888cfe3199602854e6
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Working dir: C:\Projet\Code\XXXXX
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 96a4a1d6009e56c0b91f54030390becbee21ca03
Working dir: C:\Projet\Code\XXXXX
head changed to 96a4a1d6009e56c0b91f54030390becbee21ca03
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 37b75f487f01f2720b5cf4bd1b04515e7f6e78e7
Working dir: C:\Projet\Code\XXXXX
head changed to 37b75f487f01f2720b5cf4bd1b04515e7f6e78e7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 2dbbb2678f19dc5376e32fcc4845e76514bb0667
Working dir: C:\Projet\Code\XXXXX
head changed to 2dbbb2678f19dc5376e32fcc4845e76514bb0667
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 1548934105c3747cb875a7a3acc2dfb77f446e5f
Working dir: C:\Projet\Code\XXXXX
head changed to 1548934105c3747cb875a7a3acc2dfb77f446e5f
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Working dir: C:\Projet\Code\XXXXX
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" stash pop stash@{0}
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout --theirs Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout --theirs Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" reset -q -- Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" reset -q -- Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout -- Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout -- Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout fix/missing-serialization
Working dir: C:\Projet\Code\XXXXX
head changed to 50850318431c92fed75c5fea0f2c7790a1045adc
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" stash pop stash@{0}
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Working dir: C:\Projet\Code\XXXXX
head changed to 00fc9967e28990ede397dc3f8cc76b4bfd2137d7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" --version
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" status --short
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" config --list
Working dir: C:\Projet\Code\XXXXX
head changed to 50850318431c92fed75c5fea0f2c7790a1045adc
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Physic/Physics.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1566321784.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_978561313.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[PhysicsGD] adds todo partial serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to bfa0da444215616f9bbba5662883df55dc78c014
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_4286453563.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[PhysicsGD] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to d2d383836ee47a6c5398a6b8a13bbf19d575d819
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Physic/Physics.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[PhysicsGD] remove unecessary serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 44a04081e192ef700322cb439cdff8cdbe53caab
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Outfit/Outfit.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[OutfitGD] move property implementation out of declaration"
Working dir: C:\Projet\Code\XXXXX
head changed to 9bb4c6970ba608b08e22da9ea4a7d80335c2d1e2
head changed to 59a527f0fe347f5996cd6f2c36b65b2c673167b8
head changed to f5cce01af6fed25f608ae602db07aa00dcfcfb7c
head changed to d790419f6abefebb45efbbfe2550947b5d90a17e
head changed to 0d334c7af06cb7ad326720c469d42354fc7d3eb7
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Outfit/Outfit.h
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[OutfitGD] fix commit ef32489d6ab62302d3b8cfffa0a66b53abc9c0e7"
Working dir: C:\Projet\Code\XXXXX
head changed to 58cbaa39ededc4f2417e26bca0d71adca84fbd01
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Vegetation/RegenerableVegetation.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[RegenerableVegetation] fix serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 6ebee7bf22b121ff10c6314f352e7e579761a637
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_4023413942.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3565872968.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[FactionManager] add helper to get faction name"
Working dir: C:\Projet\Code\XXXXX
head changed to e475d38cdc7c18cf2ac1f487c811fb0f41781707
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1197141673.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2177287425.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[FactionManager] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 189cf5dce703d7510083c676da0ac30661c88e0f
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1551851644.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3658887840.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_238010424.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1369102155.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_253605842.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[FactionManager] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 100b759a7c1941d0223d7c6e42978f7c04c73550
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1167790064.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2807718843.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[FactionManager] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 2f2e79974edb93daa52cb258881aeee41fb2480d
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_594382828.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1161851859.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3223487181.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[SoundManager] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 9d74616d547d547b7227b10c5789eee9cf65da5b
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2621120539.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1096458302.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[SoundManager] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to c4cd066eda90afa9d1f317a14f91b63e307649b0
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_3775789256.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Sound/SoundManager.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[SoundManager] add TODO about missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to abc422b89928f5dde00b3dd4cbf0613a00212108
head changed to e7ab7a113de78512ea003857e95c631c3deaecad
head changed to 1d68acd2f9996735a1e675cc9ff5d13137a27098
head changed to 28f86e844dbfddb0dad0bcb0f3ad26ae4a6e13f2
head changed to bd6817a5c362ea488dc9a6bcbbc65501e90de666
head changed to 1f9acf41db3c8180974f63b0a311d7aa7da1e199
head changed to bd6817a5c362ea488dc9a6bcbbc65501e90de666
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Unable to find commit 1f9acf41db3c8180974f63b0a311d7aa7da1e199
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" checkout fix/missing-serialization
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_2512742535.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_45503469.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" apply --cached --whitespace=nowarn C:\Projet\Code\XXXXX\.git\.sublime_merge_1486195221.patch
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[RegenerableVegetation] add missing serialization"
Working dir: C:\Projet\Code\XXXXX
head changed to 8c81aadb56d328c2d8d57ee71b6ef23e911b3ba3
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Faction/FactionManager.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Sound/SoundManager.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" reset -q -- Projects/XXXXX/Faction/FactionManager.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[SoundManager] remove unneeded WRITE_ONLY properties"
Working dir: C:\Projet\Code\XXXXX
head changed to 0e52573cbd3e76b27c1dad503ebdda565e7f0513
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" add -- Projects/XXXXX/Faction/FactionManager.cpp
Working dir: C:\Projet\Code\XXXXX
Executing: "C:\Program Files\Sublime Merge\Git\cmd\git.exe" -c gc.auto=0 commit -q -m "[FactionManager] remove unneeded WRITE_ONLY properties"
Working dir: C:\Projet\Code\XXXXX
head changed to 474a4bb471b6997fcbfaa53b32d17eb764aed749

sebastienandary avatar Mar 17 '21 07:03 sebastienandary

Hi @sebastienandary,

Thank you for your patience while we resolve this.

Could you confirm the following: Check if the repository is a shallow clone

  1. Navigate to your repository in Windows Explorer
  2. Navigate to the .git folder (it may be hidden, which can be changed under View > Hidden Items in Explorer)
  3. Confirm if there is a file called shallow

If there isn't, could you: Check if there is an alternate object store

  1. Repeat steps 1-2 above
  2. Navigate to the info folder
  3. Confirm there is a file called alternates

If there isn't, could you: Share the git object structure

  1. Open git-bash (If you can't find it, try searching for it in the start menu)
  2. Navigate to the repository with the commit (e.g. cd /c/my/repository)
  3. Run ls -R .git/objects
  4. Share the entire output as a .txt file

Thanks, - Dylan

dpjohnst avatar Mar 17 '21 23:03 dpjohnst

Hi @dpjohnst I'm glad to help.

Check if the repository is a shallow clone

It's not : there is no such shallow file under .git/.

Check if there is an alternate object store

There isn't : there is no such alternates file under .git/info/.

Share the git object structure

Here it is : dump_git_objects.txt

sebastienandary avatar Mar 18 '21 10:03 sebastienandary

Hi @sebastienandary,

Thanks for the additional information - it looks as if Sublime Merge is failing to locate the objects for the missing commits, and they're likely in an alternative location we haven't considered.

When you have a spare moment could you perform the following:

  1. Open git-bash
  2. Navigate to the root of the repository in question
  3. Run git verify-pack -v .git/objects/pack/pack-9c4a75025cec59fcdca5be26d917b96d6979d92c.pack and share the output
  4. Also run git git verify-pack -v .git/objects/pack/pack-d5b3d0f3a772055c41aebb578e78a461401b9dc7.pack and share the output
  5. Confirm whether there is any output from echo $GIT_ALTERNATE_OBJECT_DIRECTORIES, echo $GIT_COMMON_DIR, or echo $GIT_OBJECT_DIRECTORY (no need to share the output, just whether there is any)

Many thanks, - Dylan

dpjohnst avatar Mar 18 '21 11:03 dpjohnst

None of GIT_OBJECT_DIRECTORY, GIT_COMMON_DIR or GIT_OBJECT_DIRECTORY are defined in environment.

Here are the commands outputs :

dump-9c4a75025cec59fcdca5be26d917b96d6979d92c.txt

https://fromsmash.com/dump-d5b3d0f3a772055c41aebb578e78a461401b9dc7

sebastienandary avatar Mar 18 '21 12:03 sebastienandary

Hi @sebastienandary,

Thanks again for your patience - if it's okay with you, I'd like to send you a custom build of Sublime Merge to investigate this further. Could you reach out to me at [email protected], and I can send over the build.

Thanks, - Dylan

dpjohnst avatar Mar 19 '21 02:03 dpjohnst

Hi @dpjohnst,

Message just sent.

sebastienandary avatar Mar 19 '21 08:03 sebastienandary

This started happening to me as well this week (macOS Catalina). Might be related to upgrading to git 2.31 or running git maintenance start that is now included with git.

This only affects some of my repoes, not all. If I try to unstage the files either individually or using "unstage all", they will just get staged again immediately. Git in terminal and Sourcetree work just fine and don't show the files as staged...

I have tried:

  • Using the bundled git instead of system
  • Downgrading to build 2047
  • removing git maintenance from the repos (git maintenance stop and git maintenance unregister)

This makes Sublime Merge unusable for me so a quick fix would be much appreciated

ghost avatar Mar 19 '21 14:03 ghost

For future readers: Issue disapeared either from pulling some changes or by opening the repo with development build 2050 or something else... (note that issue appeared just after an update to build 2049)

sebastienandary avatar Mar 19 '21 14:03 sebastienandary

Hi @akselilukkarila,

Thanks for reaching out to the Sublime Merge team.

Is this issue still affecting any of your repositories?

When you have a spare moment, could you:

  • Share your Sublime Merge debug information of the affected repository via Help > Debug Information
  • Share the output of your Sublime Merge console via Tools > Show Console

Before sharing this, please take a moment to remove any sensitive information (such as paths, email addresses, remote repository addresses etc).

Additionally, would you mind also sending me an email at [email protected] and I can send you a debug build to investigate this further.

Thanks, - Dylan

dpjohnst avatar Mar 19 '21 17:03 dpjohnst

I re-cloned the affected repos and that fixed the issue for now.

ghost avatar Mar 23 '21 11:03 ghost

cc @dpjohnst

This is still happening to me. I have seen this bug for at least several months, but in the past week, I have noticed it more frequently (almost daily). The issue appears randomly, most often after a fetch, and disappears randomly usually after some number of subsequent fetches. The issue affects all worktrees of a given repository equally.

  • OS: macOS Ventura 13.3.1 (a) (22E772610a)
  • Build: 2083, stable channel

Screenshots

In this example, the current commit (NSF-570, checked out branch) is at the top of the graph ✅ and the graph connects the last few commits to the parent branch (origin/main, see the blue line on the left side of the graph) ✅ and clicking the commit that is incorrectly sorted shows the correct hash and date in the Summary on the right ✅, but the origin/main commit is not supposed to be at the very bottom ❌, and that commit did not change all 121 files in the repo ❌. Both screenshots show the graph with origin/main selected; the first shows the graph scrolled to the top, and the second shows the graph scrolled to the bottom.

Not pictured here, but just FYI: Sometimes, I have also seen that the commit that's incorrectly listed at the bottom is the currently checked out commit. Sometimes, the commit at the bottom of the list is shown with a date of 1/1/1970.

bug01

bug02

Debug info (abridged)

Click to expand debug info 
=== App Version Information ===
Build: 2083

=== Git Version Information ===
Using Git: git (system)
git version 2.39.2 (Apple Git-143)
PATH: /usr/local/bin:/Users/ansonjablinski/Developer/Repositories/ajconfig/bin:/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/3.0.0/bin:/Users/ansonjablinski/Library/Android/sdk/tools:/Users/ansonjablinski/Library/Android/sdk/platform-tools:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin (from shell)
environment variables loaded using: /usr/local/bin/fish -l


=== Browse Page Information ===
HEAD: 7020dc63e6cfefcb9b84224f3a56b993c2c54c40
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0


=== Git Status Information ===


=== Our Status Information ===


=== Git Config Information ===
advice.detachedhead=false
alias.b=branch -vv
alias.cbr=rev-parse --abbrev-ref head
alias.cdp=!git checkout develop && git pull && git show -s --oneline head@{1} head@{0}
alias.fb=!git fetch; echo; echo Branches needing attention:; git ob
alias.myweek=log --all --author=anson --since='1 week ago' --oneline --decorate
alias.ob=!git b | grep -E 'behind|ahead|gone' | grep --color -E '[.]'
alias.su=submodule update --init --checkout --recursive
branch.NSF-570.merge=refs/heads/NSF-570
branch.NSF-570.remote=origin
branch.main.merge=refs/heads/main
branch.main.remote=origin
core.attributesfile=/Users/ansonjablinski/.gitattributes
core.bare=false
core.excludesfile=/Users/ansonjablinski/.gitignore_global
core.filemode=true
core.ignorecase=true
core.logallrefupdates=true
core.precomposeunicode=true
core.repositoryformatversion=0
credential.helper=osxkeychain
delta.line-numbers=true
diff.localizablestrings.textconv=iconv -f utf-16 -t utf-8
diff.plist.textconv=plutil -convert xml1 -o -
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
filter.lfs.smudge=git-lfs smudge -- %f
help.autocorrect=20
init.defaultbranch=main
merge.conflictstyle=diff3
merge.tool=extMerge
mergetool.extMerge.cmd=extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
mergetool.extMerge.trustexitcode=false
pull.ff=only
push.default=simple
rebase.autosquash=true
remote.origin.fetch=+refs/heads/:refs/remotes/origin/*
remote.origin.url=redacted
[email protected]
user.name=Anson Jablinski


=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /Users/ansonjablinski/.config/git/config
Using config path: /Users/ansonjablinski/.gitconfig
Using config path: /path/to/repo/.git/config


Our config output is different to the Git config output
advice.detachedhead=false
alias.b=branch -vv
alias.cbr=rev-parse --abbrev-ref head
alias.cdp=!git checkout develop && git pull && git show -s --oneline head@{1} head@{0}
alias.fb=!git fetch; echo; echo Branches needing attention:; git ob
alias.myweek=log --all --author=anson --since='1 week ago' --oneline --decorate
alias.ob=!git b | grep -E 'behind|ahead|gone' | grep --color -E '[.]'
alias.su=submodule update --init --checkout --recursive
branch.NSF-570.merge=refs/heads/NSF-570
branch.NSF-570.remote=origin
branch.main.merge=refs/heads/main
branch.main.remote=origin
core.attributesfile=/Users/ansonjablinski/.gitattributes
core.bare=false
core.excludesfile=/Users/ansonjablinski/.gitignore_global
core.filemode=true
core.ignorecase=true
core.logallrefupdates=true
core.precomposeunicode=true
core.repositoryformatversion=0
delta.line-numbers=true
diff.localizablestrings.textconv=iconv -f utf-16 -t utf-8
diff.plist.textconv=plutil -convert xml1 -o -
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
filter.lfs.smudge=git-lfs smudge -- %f
help.autocorrect=20
init.defaultbranch=main
merge.conflictstyle=diff3
merge.tool=extMerge
mergetool.extMerge.cmd=extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
mergetool.extMerge.trustexitcode=false
pull.ff=only
push.default=simple
rebase.autosquash=true
remote.origin.fetch=+refs/heads/:refs/remotes/origin/*
remote.origin.url=redacted
[email protected]
user.name=Anson Jablinski


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


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


=== Our Modified Files Flag Information ===
Ignoring symlinks: 0

Console

There's this error near the top:

error parsing lexer: Packages/PHP/Embeddings/Diff (for PHP Interpolated).sublime-syntax: unable to read base syntax "Packages/Diff/Diff.sublime-syntax" at line 7 column 10

And then the only other errors are errors like this. I noticed that a2256b5 is indeed the commit that's sorted incorrectly... but 2fecbdf also shows in this log as an error, and that commit seems to be sorted just fine in the graph.

Result: success
Executing: git verify-commit --raw a2256b52de01d116cd026a7b99d919be124b10b3
Working dir: /path/to/repo/.git
Result: failed with exit code 1
Executing: git verify-commit --raw 2fecbdf4cf393d8d07b062a2cb7f6e9d59395427
Working dir: /path/to/repo/.git
Result: failed with exit code 1
Executing: git verify-commit --raw a2256b52de01d116cd026a7b99d919be124b10b3
Working dir: /path/to/repo/.git
Result: failed with exit code 1
Executing: git --version
Working dir: /path/to/repo
Result: success
Executing: git status --short
Working dir: /path/to/repo
Result: success
Executing: git config --list
Working dir: /path/to/repo
Result: success

These are the only failures listed in the console. If I run the verify-commit commands myself, I get:

$ git verify-commit --raw a2256b52de01d116cd026a7b99d919be124b10b3
error: cannot run gpg: No such file or directory
$ git verify-commit --raw 2fecbdf4cf393d8d07b062a2cb7f6e9d59395427
error: cannot run gpg: No such file or directory

ansonj avatar May 18 '23 17:05 ansonj

Hi @ansonj,

Thanks for sharing this information. Taking a look at the screenshot, it looks like commit a2256b52de is marked as having a parent commit (e34026238c), but no such commit has been loaded. I suspect this is the culprit for the commits not being loaded correctly.

Could you confirm if this is a shallow clone of the repository? Additionally, could you run git show --format=raw e34026238c via the command line and confirm git is able to load display the contents of this commit.

Kind regards, - Dylan from Sublime HQ

dpjohnst avatar May 19 '23 00:05 dpjohnst

@dpjohnst Thank you for looking into this! 🙌🏻

The repository is not a shallow clone. There doesn't seem to be any issue loading the contents of the parent commit in question.

$ git rev-parse --is-shallow-repository
false

$ git fetch --unshallow
fatal: --unshallow on a complete repository does not make sense

$ git show --format=raw e34026238c
commit e34026238c77af5036b2d0b0920f4be957634a3b
tree 3d08972bc686448a3b267bec568aea60360e6d5a
parent 694cf2c4c9f6d6a3b5e9289016a9da6ce5bcc952
author redacted 1683670697 -0400
committer redacted 1683671409 -0400

    commit message redacted

diff redacted; displays normally as far as I can tell

And here's the raw output of the commit that's misbehaving, just in case:

$ git show --format=raw a2256b52de
commit a2256b52de01d116cd026a7b99d919be124b10b3
tree 0fd1c93eacba64c410ff5f8f00997d8ad0a004c5
parent e34026238c77af5036b2d0b0920f4be957634a3b
author Anson Jablinski <[email protected]> 1684273506 -0500
committer GitHub <[email protected]> 1684273506 -0500
gpgsig -----BEGIN PGP SIGNATURE-----

 signature redacted
 -----END PGP SIGNATURE-----


        commit message redacted

diff redacted; displays normally as far as I can tell

ansonj avatar May 19 '23 14:05 ansonj

Good morning! I also just started experiencing this. Git Fork doesn't exhibit the behavior. I recently enabled the fs monitor and registered my repo with git scalar.

Our repo is enormous, so I am also using a partial clone and sparse checkouts.

photex avatar Jul 22 '23 07:07 photex

Hi all,

Just a quick update that we're actively addressing this issue. We've recently added partial clone support in Sublime Merge 2086 (development build), and are actively working on sparse index support.

Kind regards, - Dylan from Sublime HQ

dpjohnst avatar Aug 11 '23 04:08 dpjohnst

If it helps - for me this started happening after running git maintenance start. Nothing else that I can think of changed in that time.

mihakrajnc avatar Feb 16 '24 12:02 mihakrajnc

Same here, issue started after git maintenance start. @dpjohnst Is Sublime HQ still working on a fix for this issue?

pietervisser avatar Feb 19 '24 13:02 pietervisser

I can confirm the git maintenance start observation. I ran that yesterday and today, when I wanted to stage a few things, SM was really confused about my repository out of a sudden, showing 1400 files as staged (seemingly newly added) when they have not been changed and git status doesn't show anything about them either.

Additionally, some of the newly added files in my last commit (that git diff shows) are not shown inside SM when selecting that commit.

It seems likely that something in the daily maintenance jobs triggers this.

My OS is Arch Linux, in case that is relevant.

FichteFoll avatar Feb 21 '24 13:02 FichteFoll

I was able to resolve this weird state for now by running git gc once (after ensuring that I wouldn't lose anything by calling it, e.g. old HEADs). Many other methods (pulling, resetting, stashing) didn't help because git itself didn't think that there was anything special about the repo.

Obviously I also ran git maintenance stop before.

FichteFoll avatar Feb 21 '24 13:02 FichteFoll

I can confirm that running git gc works! I needed to re-open the repo in Sublime Merge.

pietervisser avatar Feb 21 '24 13:02 pietervisser

I got this same problem a little while after running git maintenance start

The console showed a lot of messages like this:

Unknown refs form in packed-refs: refs/prefetch/remotes/origin/xyz

which implies it doesn't like the prefetch behaviour of git maintenance.

I was only able to cure it by removing and re-cloning this repo. Other repos were unaffected.

bendilley avatar Feb 21 '24 13:02 bendilley

Presumably other people also watched that 'so you think you know git' talk and also ran the git maintenance start command.

Can confirm that git gc followed by restarting sublime merge will fix the issue. Tools->Refresh doesn't fix it, restarting the app is required.

taiheng avatar Feb 22 '24 16:02 taiheng