search

sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
272 stars 14 forks source link

Commit not shown in 'blame' and 'file history' dialogue (but present in git-blame <file>) #1367

Open dspasic12 opened 2 years ago

dspasic12 commented 2 years ago

Version info

Description line is accidently commited by co-worker. I cannot see this line when doing blame/file history in SM, but when looking into azure devops blame directly, the line is there clearly.

Expected behavior see the line "<<<<<<< HEAD" in both file history and git blame

Screenshots az1 az2

ratijas commented 2 years ago

What's "azure devops blame"? And does plain old "git blame" shows? Maybe it somehow depends on the git config (not sure in which way though)?

dspasic12 commented 2 years ago

azure devops is ci/cd platform like gitlab... repos and pipelines. I expect git blame to be exactly git-blame with some fancy arguments..?

File history and blame dialogue in SM do not show commit change containing: "<<<<<<< HEAD". But when i search via 'commits' tab manually or search via specific commit hash - the change is visible. Those two commits differ by hash. Blame and file history dialogue in SM do not show the commit with the desired hash. Is some sort filtering involved which might have excluded this commit from the dialogue?

plain git blame <file> shows this change (with the same hash that i can see in SM manually, but not included in blame and file history dialogue).. unfortunately i cannot see raw azure git blame command..

srbs commented 2 years ago

possible duplicate of #478

@dspasic12 is the missing commit a merge commit?

dspasic12 commented 2 years ago

yes it is, merged pull request.