Opened 6 years ago
Closed 2 years ago
#11930 closed defect (moved_to_github)
git
| Reported by: | doghead@… | Owned by: | developers |
|---|---|---|---|
| Priority: | normal | Milestone: | Barrier Breaker 14.07 |
| Component: | packages | Version: | Trunk |
| Keywords: | git | Cc: |
Description
a git pull fails on git-merge not found.
Caused by:
links under /usr/libexec/git-core/ are broken, refer to git in the current dir.
Workaround:
Create a link to git in /usr/libexec/git-core/
Version openwrt: trunk ar71xx
Version git: 1.7.11.2-1
Attachments (0)
Change History (8)
comment:1 Changed 6 years ago by blogic
- Resolution set to invalid
- Status changed from new to closed
comment:2 Changed 5 years ago by anonymous
Why this is related to host system? I can re-produce this bug by running those commands under OpenWrt
git clone git://github.com/xiangfu/mini-jtag.git
cd mini-jtag
git pull
/usr/libexec/git-core/git-pull: exec: line 1: git-merge: not found
comment:3 Changed 5 years ago by heehooman+openwrt-bugs.trac
- Resolution invalid deleted
- Status changed from closed to reopened
I can confirm the bug here too. I think it is causing issues for other commands as well (git push).
It can be solved by the following commands...
ln -s $(which git) /usr/libexec/git-core/git
("$(which git)" usually would expand to /usr/bin/git).
This bug can be resolved by including such a symbolic link in the git package.
And thanks to the collaborators on this bug for letting me know how to solve this problem!
comment:4 Changed 4 years ago by Mike Brady <mikebrady@…>
Yep, I can confirm the bug and the solution...
comment:5 Changed 4 years ago by anonymous
ln -s $(which git) /usr/libexec/git-core/git did also worked here to fix it on BarrierBreaker.
comment:6 Changed 4 years ago by jow
- Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07
Milestone Attitude Adjustment 12.09 deleted
comment:7 Changed 2 years ago by dwmw2
Still appears to be broken in CC.
comment:8 Changed 2 years ago by nbd
- Resolution set to moved_to_github
- Status changed from reopened to closed
git is maintained here: https://github.com/openwrt/packages
This is a problem related to your host system and not owrt