How do I move local, unpushed, commits from a corrupt git repository to another repository?

Question

Normally I can move pushed commits to another repository using cherry-pick: I fetch the related branch from 'another' repository to my new repo and cherry-pick with commit's ID.

I want to do the same thing for local--unpushed--commits in a corrupt repository (something went wrong and I cannot push my changes, but I need to move them to another repo).

Is there any way to cherry-pick commits from the corrupt repo to another repo?

PS: Both repositories exist on the same machine.

score 3 · Answer 1 · edited Mar 01 '17 at 19:08

3

Do you just need to push commits from one local repo to another local repo?

git remote add local /path/to/repo.git
git push local master

edited Mar 01 '17 at 19:08

Guildencrantz

1,817
1
17
30

answered Mar 01 '17 at 17:25

jaredready

1,838
3
20
48

1

yes but not all of them. spesific ones. I assume i can cherry-pick after first step – likeachamp Mar 01 '17 at 17:27
1

Yes after the first command you can treat the remote as another remote, because it really is no different. – jaredready Mar 01 '17 at 17:28
Thank you, I missed that part – jaredready Mar 01 '17 at 19:08

Guildencrantz · Answer 2 · 2020-01-13T19:14:50.897

3

Remotes aren't limited to another machine: If you have one repository at /repo1 and another at /repo2 you can copy commits from repo1 to repo2 by simply adding repo1 as a remote to repo2 using filesystem paths:

cd /repo2
git remote add repo1 /repo1

You can now fetch, pull, and cherry-pick commits from repo1 to repo2.

edited Jan 13 '20 at 19:14

answered Mar 01 '17 at 17:27

Guildencrantz

1,817
1
17
30

is there anyway to cherry-pick without adding it? one file under .git/objects is corrupted so i cannot add as a remote or push my changes etc. – likeachamp Mar 01 '17 at 17:39
1

No, you can't do a `cherry-pick` if you can't add the repo as a remote: Your best bet is to try @ElpieKay's answer to export a patch (effectively a manual `cherry-pick`). – Guildencrantz Mar 01 '17 at 17:46

score 2 · Accepted Answer · answered Mar 01 '17 at 17:36

2

Another possible method.

cd repo1_path
git format-patch -1 <commit> --stdout > /tmp/xxx.patch
cd repo2_path
git checkout <branch>
git am /tmp/xxx.patch

answered Mar 01 '17 at 17:36

ElpieKay

22,398
5
27
44

does that stand for SHA? – likeachamp Mar 01 '17 at 17:42
1

@likeachamp yes, the one you want to move. It could be a branch, a tag, or sha1 that represents the commit. – ElpieKay Mar 01 '17 at 17:43
Amazing! As my old repo is corrupted, this one is the perfect solution for me. – likeachamp Mar 01 '17 at 17:56
Is there anyway to specify date range for commits instead of picking one by one? – likeachamp Mar 01 '17 at 18:05
1

@likeachamp yes, there are some ways to specify revision range. `-1 ` could be `-n commit` where `n` is a positive number. `.. – ElpieKay Mar 02 '17 at 00:38

How do I move local, unpushed, commits from a corrupt git repository to another repository?

3 Answers3

Linked