A bug in repo sync --current-branch

231 views
Skip to first unread message

Chih-Wei

unread,
Dec 3, 2013, 9:38:15 PM12/3/13
to repo-d...@googlegroups.com
Hi,
I found a very strange bug when use 'repo sync -c (--current-branch)'.
Here are the steps to reproduce it:

$ repo sync -c prebuilts/sdk
$ cd prebuilts/sdk
$ git branch -va
* (no branch)                 be8f2bd merge in klp-factoryrom-release history after reset to klp-release
  remotes/aosp/kitkat-release b52073d merge in klp-release history after reset to klp-dev
  remotes/aosp/master         01aa9db Reconcile with jb-mr2-zeroday-release - do not merge
  remotes/m/android-4.4_r1    -> refs/tags/android-4.4_r1

$ git show refs/tags/android-4.4_r1
tag android-4.4_r1
Tagger: The Android Open Source Project <initial-co...@android.com>
Date:   Thu Oct 31 09:35:55 2013 -0700

Android 4.4 Release 1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAlJyhusACgkQ6K0/gZqxDnjXsACeLkFdoBbAQXMtC7Xww9bWhgGH
WZkAn31SxjQgbNfVgNbPEik28QvhQYaZ
=MvdV
-----END PGP SIGNATURE-----

commit be8f2bdfee143ad27f70563e27e2a41d4076be94
Merge: e1f965c 32ae141
Author: The Android Automerger <androi...@google.com>
Date:   Mon Sep 16 11:07:03 2013 -0700

    merge in klp-factoryrom-release history after reset to klp-release


However, this is INCORRECT. The tag android-4.4_r1 should be
d21cc69eb400a5ed1e3291cc369ed8cbc3744374
commit b52073d9cb1b044f4701bfc32e60b927323740fb
according to



As a result, the source tree is incorrect that results in many strange
building errors.

It could be corrected by 'repo sync' (without -c) again:
$ repo sync prebuilts/sdk
$ cd prebuilts/sdk
$ git show refs/tags/android-4.4_r1
tag android-4.4_r1
Tagger: The Android Open Source Project <initial-co...@android.com>
Date:   Wed Oct 30 15:09:22 2013 -0700

Android 4.4 Release 1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAlJxg5IACgkQ6K0/gZqxDnidJwCfXpdzaJl5tMi1iY/LBJfl3tGl
nhkAnjTnK4QpHKyVcM0PKGzukT1phxlN
=deWu
-----END PGP SIGNATURE-----

commit b52073d9cb1b044f4701bfc32e60b927323740fb
Merge: bfe1205 5a69c41
Author: The Android Automerger <androi...@google.com>
Date:   Tue Oct 29 16:07:29 2013 -0700

    merge in klp-release history after reset to klp-dev


My repo version:
$ repo --version
repo version v1.12.7
repo launcher version 1.20
       (from /home/cwhuang/bin/repo)
git version 1.8.4.2
Python 2.7.5 (default, Nov 12 2013, 16:45:54) 
[GCC 4.8.2 20131017 (Red Hat 4.8.2-1)]

Tested on Fedora 20-Beta. (and Ubuntu 12.04, same result)

Chih-Wei

unread,
Dec 3, 2013, 10:03:21 PM12/3/13
to repo-d...@googlegroups.com, android-...@googlegroups.com
After more testing, the incorrect tag android-4.4_r1 of prebuilts/sdk
seems to come from the clone.bundle:

https://android.googlesource.com/platform/prebuilts/sdk/clone.bundle

Disabling use of clone.bundle fixes it:

$ repo sync --no-clone-bundle --current-branch prebuilts/sdk

Probably the clone.bundle of prebuilts/sdk should be regenerated.

So cc to the Android-Building group.

Chih-Wei於 2013年12月4日星期三UTC+8上午10時38分15秒寫道：
Hi,
I found a very strange bug when use 'repo sync -c (--current-branch)'.
Here are the steps to reproduce it:

$ repo sync -c prebuilts/sdk
$ cd prebuilts/sdk
$ git branch -va
* (no branch)                 be8f2bd merge in klp-factoryrom-release history after reset to klp-release
  remotes/aosp/kitkat-release b52073d merge in klp-release history after reset to klp-dev
  remotes/aosp/master         01aa9db Reconcile with jb-mr2-zeroday-release - do not merge
  remotes/m/android-4.4_r1    -> refs/tags/android-4.4_r1

$ git show refs/tags/android-4.4_r1
tag android-4.4_r1
Tagger: The Android Open Source Project <initial-contribution@android.com>
tag android-4.4_r1
Tagger: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 30 15:09:22 2013 -0700

Android 4.4 Release 1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAlJxg5IACgkQ6K0/gZqxDnidJwCfXpdzaJl5tMi1iY/LBJfl3tGl
nhkAnjTnK4QpHKyVcM0PKGzukT1phxlN
=deWu
-----END PGP SIGNATURE-----

commit b52073d9cb1b044f4701bfc32e60b927323740fb
Merge: bfe1205 5a69c41
Author: The Android Automerger <androi...@google.com>
Date:   Tue Oct 29 16:07:29 2013 -0700

    merge in klp-release history after reset to klp-dev
Reply all
Reply to author
Forward
0 new messages