Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Broken git history #199

Open
AndSDev opened this issue Jan 9, 2019 · 5 comments
Open

Broken git history #199

AndSDev opened this issue Jan 9, 2019 · 5 comments

Comments

@AndSDev
Copy link

AndSDev commented Jan 9, 2019

Lakka required 2f6aee4 commit.
This commit doesn’t exist in the master branch (but exists in PR #197).
@andres-asm
Copy link

someone had rebased the repo incorrectly
The same commit is in master: https://github.com/libretro/snes9x/commits/master

0b787be

@AndSDev
Copy link
Author

AndSDev commented Jan 10, 2019

The problem is that other projects refer directly to this commit.
In this regard, now they can not be compiled without additional settings.
As a quick fix, I propose to add a tag to the commit with the old commit hash.

@andres-asm
Copy link

the problem is that people seemingly can't use GIT properly, then they merge, the history is broken.
The real commit is the one I posted (check upstream)

I dunno about your solution, I'd say update such projects instead.

@orbea
Copy link

orbea commented Jan 12, 2019 •
edited
Loading

Just use upstream's repo and you won't have this problem...

https://github.com/snes9xgit/snes9x

@ehmry
Copy link

ehmry commented Nov 19, 2019

If upstream is merging our patches, why does this repo exist?

thefloweringash added a commit to thefloweringash/nixpkgs that referenced this issue Jan 11, 2020
@thefloweringash
libretro.snes9x: 29b78d -> 04692e
03c4361 
Upstream has broken git history [1], so the current version cannot be
fetched. The required patches have been upstreamed [2], and we hope
that upstream will be more careful with their git history.

The previous commit can still be viewed on github [3], but is not the
ancestor of any fetchable ref.

[1] libretro/snes9x#199
[2] snes9xgit/snes9x#588
[3] libretro/snes9x@29b78df
@thefloweringash thefloweringash mentioned this issue Jan 11, 2020
Merged
10 tasks
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this issue Feb 12, 2020
@thefloweringash @dtzWill
libretro.snes9x: 29b78d -> 04692e
95f867d 
Upstream has broken git history [1], so the current version cannot be
fetched. The required patches have been upstreamed [2], and we hope
that upstream will be more careful with their git history.

The previous commit can still be viewed on github [3], but is not the
ancestor of any fetchable ref.

[1] libretro/snes9x#199
[2] snes9xgit/snes9x#588
[3] libretro/snes9x@29b78df

(cherry picked from commit 03c4361)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@ehmry @andres-asm @orbea @AndSDev