Sublime Forum

[SOLVED] Can't Discard/Stage red files!

#1

Hi, I can’t Discard/Stage red files.
I do pressed “Stage” once to discard and I pressed “Discard” twice to confirm but with no luck in both situation.
Check the following image

So, I did print log for this:

=== App Version Information ===
Build: 1058

=== Git Version Information ===
Using Git: git
git version 2.16.4

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

=== Git Status Information ===
 M application/controllers/debug.php
 M application/libraries/SystemDB.php
?? migrations/25-09-2018_10_54.sql

=== Our Status Information ===
 M application/controllers/debug.php
 M application/libraries/SystemDB.php
 D application/libraries/phpseclib/Crypt/AES.php
 D application/libraries/phpseclib/Crypt/Base.php
 D application/libraries/phpseclib/Crypt/Blowfish.php
 D application/libraries/phpseclib/Crypt/DES.php
 D application/libraries/phpseclib/Crypt/Hash.php
 D application/libraries/phpseclib/Crypt/RC2.php
 D application/libraries/phpseclib/Crypt/RC4.php
 D application/libraries/phpseclib/Crypt/RSA.php
 D application/libraries/phpseclib/Crypt/Random.php
 D application/libraries/phpseclib/Crypt/Rijndael.php
 D application/libraries/phpseclib/Crypt/TripleDES.php
 D application/libraries/phpseclib/Crypt/Twofish.php
 D application/libraries/phpseclib/File/ANSI.php
 D application/libraries/phpseclib/File/ASN1.php
 D application/libraries/phpseclib/File/X509.php
 D application/libraries/phpseclib/Math/BigInteger.php
 D application/libraries/phpseclib/Net/SCP.php
 D application/libraries/phpseclib/Net/SFTP.php
 D application/libraries/phpseclib/Net/SFTP/Stream.php
 D application/libraries/phpseclib/Net/SSH1.php
 D application/libraries/phpseclib/Net/SSH2.php
 D application/libraries/phpseclib/System/SSH/Agent.php
 D application/libraries/phpseclib/System/SSH_Agent.php
 D application/libraries/phpseclib/openssl.cnf
?? migrations/25-09-2018_10_54.sql

=== Git Config Information ===
alias.pushall=!git remote | xargs -L1 git push --all
branch.master.merge=refs/heads/master
branch.master.remote=origin
core.bare=false
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
remote.RAE.fetch=+refs/heads/*:refs/remotes/RAE/*
remote.RAE.url=ssh://raecom@192.168.0.242/GitServer/kpi-web-application
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@bitbucket.org:rae-dev-team/kpi-web-application.git
remote.vzool.fetch=+refs/heads/*:refs/remotes/vzool/*
remote.vzool.url=vZoolBitBucket:/vzool/kpi-web-application.git
user.email==
user.name==

=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /home/vzool/git/config
Using config path: /home/vzool/.gitconfig
Using config path: /home/vzool/Workspace/kpi-web-application/.git/config

Our config output is identical to the Git config output

=== Git Attributes Information ===
git check_attr --all output
application/controllers/debug.php
application/libraries/SystemDB.php
application/libraries/phpseclib/Crypt/AES.php
application/libraries/phpseclib/Crypt/Base.php
application/libraries/phpseclib/Crypt/Blowfish.php
application/libraries/phpseclib/Crypt/DES.php
application/libraries/phpseclib/Crypt/Hash.php
application/libraries/phpseclib/Crypt/RC2.php
application/libraries/phpseclib/Crypt/RC4.php
application/libraries/phpseclib/Crypt/RSA.php
application/libraries/phpseclib/Crypt/Random.php
application/libraries/phpseclib/Crypt/Rijndael.php
application/libraries/phpseclib/Crypt/TripleDES.php
application/libraries/phpseclib/Crypt/Twofish.php
application/libraries/phpseclib/File/ANSI.php
application/libraries/phpseclib/File/ASN1.php
application/libraries/phpseclib/File/X509.php
application/libraries/phpseclib/Math/BigInteger.php
application/libraries/phpseclib/Net/SCP.php
application/libraries/phpseclib/Net/SFTP.php
application/libraries/phpseclib/Net/SFTP/Stream.php
application/libraries/phpseclib/Net/SSH1.php
application/libraries/phpseclib/Net/SSH2.php
application/libraries/phpseclib/System/SSH/Agent.php
application/libraries/phpseclib/System/SSH_Agent.php
application/libraries/phpseclib/openssl.cnf

=== Our Modified Files Newline Normalisation and EOL Information ===
application/controllers/debug.php: unspecified - native
application/libraries/SystemDB.php: unspecified - native
application/libraries/phpseclib/Crypt/AES.php: unspecified - native
application/libraries/phpseclib/Crypt/Base.php: unspecified - native
application/libraries/phpseclib/Crypt/Blowfish.php: unspecified - native
application/libraries/phpseclib/Crypt/DES.php: unspecified - native
application/libraries/phpseclib/Crypt/Hash.php: unspecified - native
application/libraries/phpseclib/Crypt/RC2.php: unspecified - native
application/libraries/phpseclib/Crypt/RC4.php: unspecified - native
application/libraries/phpseclib/Crypt/RSA.php: unspecified - native
application/libraries/phpseclib/Crypt/Random.php: unspecified - native
application/libraries/phpseclib/Crypt/Rijndael.php: unspecified - native
application/libraries/phpseclib/Crypt/TripleDES.php: unspecified - native
application/libraries/phpseclib/Crypt/Twofish.php: unspecified - native
application/libraries/phpseclib/File/ANSI.php: unspecified - native
application/libraries/phpseclib/File/ASN1.php: unspecified - native
application/libraries/phpseclib/File/X509.php: unspecified - native
application/libraries/phpseclib/Math/BigInteger.php: unspecified - native
application/libraries/phpseclib/Net/SCP.php: unspecified - native
application/libraries/phpseclib/Net/SFTP.php: unspecified - native
application/libraries/phpseclib/Net/SFTP/Stream.php: unspecified - native
application/libraries/phpseclib/Net/SSH1.php: unspecified - native
application/libraries/phpseclib/Net/SSH2.php: unspecified - native
application/libraries/phpseclib/System/SSH/Agent.php: unspecified - native
application/libraries/phpseclib/System/SSH_Agent.php: unspecified - native
application/libraries/phpseclib/openssl.cnf: unspecified - native

Is there something wrong with my repo or it is a bug in Sublime-Merge?

Thanks

0 Likes

#2

It looks like we’re disagreeing with Git about the ‘deleted’ files: Git doesn’t think the files are deleted, so when you stage or discard them, Git does nothing.

There will be a new build out in a day or two that should bring the Sublime Merge status information properly into alignment with the Git status information, and therefore address the issue.

1 Like

#3

From my prospective in command line Git is disagree that these files were deleted, but Sublime-Merge said something different. Those files are still there.

I did git status from shell and this is the output:

➜  kpi-web-application git:(master) ✗ git status                 
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   application/controllers/debug.php
	modified:   application/controllers/zone.php
	modified:   application/libraries/SystemDB.php
	modified:   application/views/forms/zone_form.php

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	application/views/forms/zone_selection_form.php
	migrations/25-09-2018_10_54.sql

no changes added to commit (use "git add" and/or "git commit -a")

So, what Sublime-Merge claims not correct.

0 Likes

#4

Ok, I will waiting for the new update then I will tell you about it :blush:

0 Likes

#5

Dev build 1060 is out, which should hopefully address this issue. https://www.sublimemerge.com/dev

2 Likes

#6

Good, Problem Solved
Thanks buddy

0 Likes

#7

I’m using stable 1116 (currently newest) and still having issue. Shouldn’t it be fixed in 1060 then?

0 Likes