Here is the log of today, I remove the git log --graph --all to keep it
shorter:
The file changes you see below are lost, how did this exactly happen ?
(I can guess but I would rather have an expert look at it):
(I don't like git stash much, maybe it should be called git stash push,
just to make clear what it does, what does git stash do ? is it like git
stash push ? what is it's default behaviour?)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git switch AddThreadInfo
Switched to branch 'AddThreadInfo'
M src/core/ULog.pas
M src/core/UNetProtocol.pas
M src/core/UNode.pas
M src/core/UPCAbstractMem.pas
M src/core/UPCOperationsBlockValidator.pas
M src/core/UPCOperationsSignatureValidator.pas
M src/core/UPoolMinerThreads.pas
M src/core/UPoolMining.pas
M src/core/URPC.pas
M src/core/UTCPIP.pas
M src/core/UThread.pas
M src/gui-classic/UFRMAccountSelect.pas
M src/gui-classic/UFRMDiagnosticTool.pas
M src/gui-classic/UFRMRandomOperations.pas
M src/gui-classic/UFRMWallet.dfm
M src/gui-classic/UFRMWallet.pas
M src/gui-classic/UFRMWalletConfig.dfm
M src/gui-classic/UGridUtils.pas
M src/pascalcoin_wallet_classic.dpr
M src/pascalcoin_wallet_classic.dproj
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash
Saved working directory and index state WIP on AddThreadInfo: 98b6cf9
Potential bug fix for TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git status
On branch AddThreadInfo
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/gui-classic/Frames/UFrameThreadInfo.dfm
src/gui-classic/Frames/UFrameThreadInfo.pas
nothing added to commit but untracked files present (use "git add" to track)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git add .
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash
Saved working directory and index state WIP on AddThreadInfo: 98b6cf9
Potential bug fix for TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git status
On branch AddThreadInfo
nothing to commit, working tree clean
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git switch RefactorCode
Switched to branch 'RefactorCode'
Your branch is up to date with 'origin/RefactorCode'.
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git switch Release56
Switched to a new branch 'Release56'
Branch 'Release56' set up to track remote branch 'Release56' from 'origin'.
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(Release56)
$ git switch RefactorCode
Switched to branch 'RefactorCode'
Your branch is up to date with 'origin/RefactorCode'.
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git status
On branch RefactorCode
Your branch is up to date with 'origin/RefactorCode'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/gui-classic/Frames/UFrameAccountExplorer.dfm
modified: src/gui-classic/Frames/UFrameAccountExplorer.pas
no changes added to commit (use "git add" and/or "git commit -a")
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git add .
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git stash
Saved working directory and index state WIP on RefactorCode: 98b6cf9
Potential bug fix for TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git switch AddThreadInfo
Switched to branch 'AddThreadInfo'
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git status
On branch AddThreadInfo
nothing to commit, working tree clean
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash
No local changes to save
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash pop
On branch AddThreadInfo
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/gui-classic/Frames/UFrameAccountExplorer.dfm
modified: src/gui-classic/Frames/UFrameAccountExplorer.pas
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (a42b3cd36bab63af0ad033904f9666261028a12c)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash
Saved working directory and index state WIP on AddThreadInfo: 98b6cf9
Potential bug fix for TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git switch RefactorCode
Switched to branch 'RefactorCode'
Your branch is up to date with 'origin/RefactorCode'.
g
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git stash pop
On branch RefactorCode
Your branch is up to date with 'origin/RefactorCode'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/gui-classic/Frames/UFrameAccountExplorer.dfm
modified: src/gui-classic/Frames/UFrameAccountExplorer.pas
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (f503e84194c5306fa2e78c857c70333cf80b9f84)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git status
On branch RefactorCode
Your branch is up to date with 'origin/RefactorCode'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/gui-classic/Frames/UFrameAccountExplorer.dfm
modified: src/gui-classic/Frames/UFrameAccountExplorer.pas
no changes added to commit (use "git add" and/or "git commit -a")
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git add .
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git status
On branch RefactorCode
Your branch is up to date with 'origin/RefactorCode'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: src/gui-classic/Frames/UFrameAccountExplorer.dfm
modified: src/gui-classic/Frames/UFrameAccountExplorer.pas
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git commit
[RefactorCode 998edb9] Filter accounts by balance max events fixed.
2 files changed, 32 insertions(+), 2 deletions(-)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git switch AddThreadInfo
Switched to branch 'AddThreadInfo'
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash pop
On branch AddThreadInfo
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: src/gui-classic/Frames/UFrameThreadInfo.dfm
new file: src/gui-classic/Frames/UFrameThreadInfo.pas
Dropped refs/stash@{0} (684951aa904ef404d6e5359276c208ab16303e85)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash
Saved working directory and index state WIP on AddThreadInfo: 98b6cf9
Potential bug fix for TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git switch release56
Switched to branch 'release56'
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(release56)
$ git switch RefactorCode
error: Your local changes to the following files would be overwritten by
checkout:
src/pascalcoin_wallet_classic.res
Please commit your changes or stash them before you switch branches.
Aborting
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(release56)
$ git switch RefactorCode -f
Switched to branch 'RefactorCode'
Your branch is ahead of 'origin/RefactorCode' by 1 commit.
(use "git push" to publish your local commits)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git status
On branch RefactorCode
Your branch is ahead of 'origin/RefactorCode' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git push origin RefactorCode
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 813 bytes | 271.00 KiB/s, done.
Total 7 (delta 6), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (6/6), completed with 6 local objects.
To https://github.com/SkybuckFlying/PascalCoin.git
98b6cf9..998edb9 RefactorCode -> RefactorCode
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(RefactorCode)
$ git switch AddThreadInfo
Switched to branch 'AddThreadInfo'
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git status
On branch AddThreadInfo
nothing to commit, working tree clean
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash pop
On branch AddThreadInfo
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: src/gui-classic/Frames/UFrameThreadInfo.dfm
new file: src/gui-classic/Frames/UFrameThreadInfo.pas
Dropped refs/stash@{0} (a2175ce45c1decf953e96fb97f28af7646907dd2)
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git status
On branch AddThreadInfo
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: src/gui-classic/Frames/UFrameThreadInfo.dfm
new file: src/gui-classic/Frames/UFrameThreadInfo.pas
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$ git stash list
stash@{0}: WIP on AddThreadInfo: 98b6cf9 Potential bug fix for
TFrameAccountExplorer
Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin
(AddThreadInfo)
$
Fortunately the changes are easy to replicate, but I am not amuzed by these
lost changes...
Bye for now,
Skybuck.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/38420712-7c57-43d7-80ff-628c0a918900n%40googlegroups.com.
