Issue 705904 link

Starred by 1 user

Issue metadata

Status:	Archived
Owner:	drinkcat@chromium.org
Closed:	Mar 2017
Cc:	vapier@chromium.org
Components:	OS>Packages
EstimatedDays:	0
NextAction:	----
OS:	Chrome
Pri:	3
Type:	Bug
VerifyIn-60 VerifyIn-61

cros_sdk: git in chroot is too old

Project Member Reported by drinkcat@chromium.org, Mar 28 2017

Issue description

Start rebase outside of chroot (git version 2.12.2.564.g063fe858b8-goog), then trying to continue inside chroot (git version 2.6.6), leads to strange errors:

$ git rebase --continue
/home/drinkcat/trunk/src/platform/ec/.git/rebase-merge/author-script: line 3: unexpected EOF while looking for matching `''
/home/drinkcat/trunk/src/platform/ec/.git/rebase-merge/author-script: line 4: syntax error: unexpected end of file

It would be nice to pull in the latest git inside Chrome OS chroot as well.

Project Member

Comment 1 by bugdroid1@chromium.org, Mar 29 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/portage-stable/+/a2ffb7f945121637e8b48278476967ccea4df339

commit a2ffb7f945121637e8b48278476967ccea4df339
Author: Nicolas Boichat <drinkcat@google.com>
Date: Wed Mar 29 18:42:18 2017

dev-vcs/git: Upgrade to 2.12.2 from Gentoo portage

For some reason, cros_portage_upgrade did not pick this up, so
manually copied the ebuild, replaced EAPI 6 => 5, and set
KEYWORDS="*".

BUG= chromium:705904 
TEST=sudo emerge -av git
TEST=Start git rebase outside chroot, continue inside chroot
     (git rebase --continue), no error.

Change-Id: I9df79f5ae3fd2b7aec2630d816a2a65155ff1d1c
Reviewed-on: https://chromium-review.googlesource.com/461700
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[rename] https://crrev.com/a2ffb7f945121637e8b48278476967ccea4df339/dev-vcs/git/git-2.12.2.ebuild
[modify] https://crrev.com/a2ffb7f945121637e8b48278476967ccea4df339/dev-vcs/git/files/git-daemon-r1.initd
[rename] https://crrev.com/a2ffb7f945121637e8b48278476967ccea4df339/dev-vcs/git/files/git-2.12.0-optional-cvs.patch
[modify] https://crrev.com/a2ffb7f945121637e8b48278476967ccea4df339/dev-vcs/git/Manifest
[delete] https://crrev.com/bf729a8c297eceb36e3039798e715d77221f9297/dev-vcs/git/files/git-2.8.4-optional-cvs.patch
[modify] https://crrev.com/a2ffb7f945121637e8b48278476967ccea4df339/dev-vcs/git/metadata.xml
[delete] https://crrev.com/bf729a8c297eceb36e3039798e715d77221f9297/dev-vcs/git/files/git-2.2.2-optional-cvs.patch
[delete] https://crrev.com/bf729a8c297eceb36e3039798e715d77221f9297/dev-vcs/git/files/git-daemon_at.service