Arch Linux

graysky

Wiki Maintainer

From: :wq

Registered: 2008-12-01

Posts: 10,724

Website

git command to apply a pending PR to foo-git [SOLVED]

When building a git package (ie foo-git) where the source is the git repo, what is the git command to pull a pending PR, for example PR#1234?  In the past, add this to the prepare function did it:

git pull --no-edit --rebase origin pull/1234/head

But now I get:

==> Starting prepare()...
From /srcdest/xbmc
 * branch                    refs/pull/24199/head -> FETCH_HEAD
Committer identity unknown

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'builduser@arch-nspawn-2584336.(none)')

I can add the following to the prepare function, but this seems like too much work:

  git config user.email "you@example.com"
  git config user.name "Your Name"
  git pull --no-edit --rebase origin pull/1234/head

Last edited by graysky (2023-12-09 18:55:28)

---

AUR packages • Zsh and other configs

Head_on_a_Stick

Member

From: The Wirral

Registered: 2014-02-20

Posts: 8,999

Website

Re: git command to apply a pending PR to foo-git [SOLVED]

I think you should use `git reset` instead of `git pull`. A pull implies a merge, hence the ID request.

https://stackoverflow.com/questions/430 … gin-branch

---

Jin, Jîyan, Azadî

graysky

Wiki Maintainer

From: :wq

Registered: 2008-12-01

Posts: 10,724

Website

Re: git command to apply a pending PR to foo-git [SOLVED]

What is the proper syntax to use git reset to apply a PR?

---

AUR packages • Zsh and other configs

Head_on_a_Stick

Member

From: The Wirral

Registered: 2014-02-20

Posts: 8,999

Website

Re: git command to apply a pending PR to foo-git [SOLVED]

Not sure

Try

git reset --hard $commit

Replace $commit with the actual commit, ofc.

---

Jin, Jîyan, Azadî

merlock

Member

Registered: 2018-10-30

Posts: 262

Re: git command to apply a pending PR to foo-git [SOLVED]

Maybe something here might help?

---

Eenie meenie, chili beanie, the spirits are about to speak -- Bullwinkle J. Moose
It's a big club...and you ain't in it -- George Carlin
Registered Linux user #149839
perl -e 'print$i=pack(c5,(41*2),sqrt(7056),(unpack(c,H)-2),oct(115),10); '

Lone_Wolf

Administrator

From: Netherlands, Europe

Registered: 2005-10-04

Posts: 14,576

Re: git command to apply a pending PR to foo-git [SOLVED]

I prefer not using git/svn/bzr etc commands, but adding commit urls to the source array, then using patch to apply them.

---

Disliking systemd intensely, but not satisfied with alternatives so focusing on taming systemd.

clean chroot building not flexible enough ?
Try clean chroot manager by graysky

graysky

Wiki Maintainer

From: :wq

Registered: 2008-12-01

Posts: 10,724

Website

Re: git command to apply a pending PR to foo-git [SOLVED]

@Lone_Wolf - problem here is that PR I need to apply contains binary diffs which are not supported by patch.

---

AUR packages • Zsh and other configs

loqs

Member

Registered: 2014-03-06

Posts: 18,732

Re: git command to apply a pending PR to foo-git [SOLVED]

@Lone_Wolf - problem here is that PR I need to apply contains binary diffs which are not supported by patch.

Use git apply in place of patch?

graysky

Wiki Maintainer

From: :wq

Registered: 2008-12-01

Posts: 10,724

Website

Re: git command to apply a pending PR to foo-git [SOLVED]

@Lone_Wolf - problem here is that PR I need to apply contains binary diffs which are not supported by patch.

Use git apply in place of patch?

Yes!  That did the trick, thanks!

---

AUR packages • Zsh and other configs