Bad revision for stash

[roblourens]

The error from #588...

• I open the gitlens sidebar
• Right click any stash, click "apply"
• The stash can't be applied, and the output channel says something like Error: fatal: bad revision 'stash@{0}^3'

Seems that the @{} syntax can't be combined with ^?

[eamodio]

@roblourens are you attempting to apply the whole stash or just a single file from it?

[roblourens]

The whole stash

[eamodio]

@roblourens can you try gitlens-9.0.4-beta.vsix.zip and see if it resolves the issue?

[roblourens]

No, same issue.

I get the error just from clicking on the stash, not trying to apply it necessarily.

[eamodio]

Hrm, I can't seem to reproduce that. Can you set the outputLevel to debug and send me logs?

[roblourens]

I set the outputLevel to debug, cleared the output channel and clicked around a bit. Not sure there's any more detail. Is there a different log?

[2018-12-11 16:58:27:826] [db] GitService.getLog — e=/Users/roblou/code/vscode, t={"maxCount":1,"ref":"stash@{4}^3"}
[2018-12-11 16:58:27:843] git — -c, core.quotepath=false, -c, color.ui=false, -c, diff.renameLimit=0, log, --name-status, --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e, --full-history, -M, -m, -n1, stash@{4}^3, --,   cwd='/Users/roblou/code/vscode'

  
Error: fatal: bad revision 'stash@{4}^3'

[2018-12-11 16:58:27:844] [/Users/roblou/code/vscode] git log --name-status --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m -n1 stash@{4}^3 -- • 17 ms 
[2018-12-11 16:58:27:844] [db] GitService.getLog completed • 17 ms
[2018-12-11 16:58:31:231] [dc] GitService.getLog — e=/Users/roblou/code/vscode, t={"maxCount":1,"ref":"stash@{5}^3"}
[2018-12-11 16:58:31:256] git — -c, core.quotepath=false, -c, color.ui=false, -c, diff.renameLimit=0, log, --name-status, --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e, --full-history, -M, -m, -n1, stash@{5}^3, --,   cwd='/Users/roblou/code/vscode'

  
Error: fatal: bad revision 'stash@{5}^3'

[2018-12-11 16:58:31:257] [/Users/roblou/code/vscode] git log --name-status --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m -n1 stash@{5}^3 -- • 25 ms 
[2018-12-11 16:58:31:257] [dc] GitService.getLog completed • 25 ms
[2018-12-11 16:58:35:767] [dd] GitService.getLog — e=/Users/roblou/code/vscode, t={"maxCount":1,"ref":"stash@{6}^3"}
[2018-12-11 16:58:35:786] git — -c, core.quotepath=false, -c, color.ui=false, -c, diff.renameLimit=0, log, --name-status, --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e, --full-history, -M, -m, -n1, stash@{6}^3, --,   cwd='/Users/roblou/code/vscode'

  
Error: fatal: bad revision 'stash@{6}^3'

[2018-12-11 16:58:35:786] [/Users/roblou/code/vscode] git log --name-status --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m -n1 stash@{6}^3 -- • 19 ms 
[2018-12-11 16:58:35:786] [dd] GitService.getLog completed • 19 ms

[eamodio]

Hrm, I can't repro this at all. I see the same git calls, but stash@{0}^3 is a valid ref -- its getting the first stashed and looking for any untracked files in it (see: https://stackoverflow.com/questions/12681529/)

What version of Git do you have? Is this on macOS?

[eamodio]

I'm assuming if you run the same command on the command line it fails as well?
git -c core.quotepath=false -c color.ui=false -c diff.renameLimit=0 log --name-status --format="%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e" --full-history -M -m -n1 stash@{6}^3 --

Does running git ls-tree -r stash@{0}^3 work?

[roblourens]

I see the same error for that command.

$ git --version
git version 2.17.2 (Apple Git-113)

$ git ls-tree -r stash@{0}^3
fatal: Not a valid object name stash@{0}^3

[eamodio]

If you explicitly stash an untracked file and then run those commands against that stash does it work?

[roblourens]

Can you tell me what commands to run? I'm not even clear what the ^3 means here.

[eamodio]

Add a new file to your repo (but don't stage it), and then right-click on it and select Stash Changes -- GitLens will stash that untracked file.

Then run:
git -c core.quotepath=false -c color.ui=false -c diff.renameLimit=0 log --name-status --format="%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e" --full-history -M -m -n1 stash@{0}^3 --

and

git ls-tree -r stash@{0}^3

[eamodio]

The way git stores stashes is kind of a 3-way merge (it has 3 parents) -- if you don't have any untracked files (or don't use the --include-untracked) the 3rd parent is just the root of the repo (empty), but if you do include untracked then the 3rd parent is the blob with the untracked file (or at least that's how I understand it)

And the ^ syntax is to get the parent of that ref -- and ^n is to get the nth parent

[roblourens]

$ git ls-tree -r stash@{0}^3
100644 blob 45b983be36b73c0788dc9cbcb76cbb80fc7bb057    test.txt
$ git ls-tree -r stash@{1}^3 # some other stash
fatal: Not a valid object name stash@{1}^3