Issue #7032 resolved

AUI Repo is behaving strangely

Benjamin Wong
created an issue

After a release of AUI that usually pushes two commits to our repo there's only one commit. I can see the two commits locally on buildbox though which suggests something happened during the push (You can see the commit here https://bitbucket.org/atlassian/aui/commits/all) .

I can't seem to pull this commit to my local clone either, git pull origin master only pulls up to the commit before (I also attempted to merge in a PR before I realised something was funny, that also failed.). A fresh clone also doesn't pull in this commit.

Is anyone able to check the state of our repo? I'm not sure how to proceed. Not being able to merge in PR's will definitely be a blocker for us.

Thanks!

Comments (14)

  1. Nicolas Venegas

    Hi Ben

    Would you be able to give me the hashes of the two commits in question? I'm not sure which ones you're referring to (and thus can't search for it in the repo on our servers).

    Here is the output of git fsck --full:

    $ git fsck --full
    Checking object directories: 100% (256/256), done.
    Checking objects: 100% (38528/38528), done.
    dangling commit 330450d62d87a7b154046d709995c827aea26f9a
    dangling commit e308bcb06b6bbd7f542aa9b343db74d961873296
    dangling commit 880ab43030a88e0f4a2a74b1d449ca5c0c3aee20
    dangling commit 700b4e9641bbbcedaae3c20c4c660851295a3867
    dangling commit 6c0ec673ca7661d74cc007e1cba807ae7e2f9061
    dangling commit e81844ed7306eec9a01b4ff9127eaf6e75da5527
    dangling commit d020144212d99fe4ca31cea74dfbb09050209b58
    dangling commit 112456e4e3da2b41fd3e4900cf78baadc003eb44
    dangling commit 9426e67299fbb232c811b9b73e42c2f9c947063c
    dangling commit 552bb06ca131d2b0830b989e7627ecf51ef5dddc
    dangling commit 472c1e7ad535a0426b6f49fd43a135962d0ed78e
    dangling commit 0f2fb6fa052a554511da35def18f226fec7b9e40
    dangling commit de36f01cab2421fd099af773cb4892a9bab9e27d
    dangling commit ec38de78aa884ca4002830fba3bda6995bab45c5
    dangling commit 96417089cadba12a7c0aa6d1f1e213685ce9d0a2
    dangling commit 454bbce22c74682cca02828c70195e47ec73c17d
    dangling commit 764e745b3fa91a188df2f7ca21971397984e987a
    dangling commit 4c52582afa0e391ea75f9ab0ad0b8e6e3ca5899f
    dangling commit d357fcd87b99e5b05414d8ad8d1f2cd64b0c2a7b
    dangling commit 4b5826736b5f50afb41c3e079643ad20c8d1f2b6
    dangling commit 196120a843cd10c7c23a32aefb493ee34914f752
    dangling commit 566272fa459f7b126d8c990d1ba0308f2120a544
    dangling commit f5634eb3b8e35a8e032f3d23ee9b1f0b16a7d1e9
    dangling commit bf6588f19afc16c34e6ada4ea697a9b874a8966e
    dangling commit bd69e2facde4628dc92567da874254563f613816
    dangling commit 866f96ff64a4d252f69759c444766579ee0c065e
    dangling commit b5746227da1535ba3e4fd9ef716709e5aae1a1d8
    dangling commit 9277d47ab9227cf17c4dee4ed09891fdbaa2f623
    dangling commit 12788a2af6241707e038e916169c2d13ec739282
    dangling commit 2c82b49bde7d86f90c349a6f03975e4b01aaaae0
    dangling commit c9842858a6809c5ef923223bac418460fa097159
    dangling commit 0f91b62f75312ebd38ae0d07aec1f9f19211f91c
    dangling commit a8926487912b4c6b8ca757ad3987820c7b0fe8b1
    dangling commit a994b8fa6d6d33edd48f2f3aa66489e728d25bc3
    dangling commit 9596b84c227f446866338139c41910871c2a2721
    dangling commit a297e0feec8ec74234e11b67123d4c25af51033a
    dangling commit 749d2619459a5b5009d86c4377c6e69e6c4fa479
    dangling commit 2d9e489efb275ab7ca5ad8e2db27469d49fc5633
    dangling commit 71a2cc4f408f41e9d1edb261fc300dfad35021c4
    dangling commit d9a7d28f675fa743ecf16774b549130bb421ca76
    dangling commit a6a94cf29f7f56b8ffcd9aede5590413505811a0
    dangling commit 72ab02d869050b3cd1ddee8610e575d8510260f2
    dangling commit 44b0de90246fe4a0f6487e89193614df000c1c9b
    dangling commit dfb3f6576b4f951ee6d90cfa9067d3316e2aecb2
    dangling commit 7ab41e9dd37b6a2b3c8fe33a1b12bb5de4d5fdaa
    dangling commit f9b4489de91a3e685cf2a61b55b33a7508d7f5d1
    dangling commit 16b7a2589fba3374ca3ffdf0d91cf8f2d338340e
    dangling commit 5ebbd8352ef948e5743e7dcc590d1355ca6e04a3
    dangling commit 2bc0d6b081da97d9495ef8888475b9235610bae9
    dangling commit 94c04aa51c0570eab664eb3427dac5a914f015e4
    dangling commit 3bc172a2f6d85f8a74f7562dbce38cfdeafc13ed
    dangling commit 0ac34aab434499f14f2a05f3254ea76a29025b27
    dangling commit c2c96007ae49201d5111db436f250b7e4baa3e3b
    dangling commit fecb3a052d16b61c959065e5de4825273a37bab2
    dangling commit 41cfb8b1abd1cfbf7de5dc7e17c7dc79e20e4db1
    dangling commit 62d4882962446d2d7248841c79e39b733fa8cbe4
    dangling commit 81d8328cb145fe1c440854a737e32fe0ebddbc89
    dangling commit a0d90acca68d6f83d0d62874deca932dab363a52
    dangling commit d2d9c0cccd698a633b386dcedf739673580b4338
    dangling commit f9e2ba6c35dae3d1744758cca9cf3b8b3bf94c1a
    dangling commit 2be696670dc51898d4787a2af2c52129082a2366
    dangling commit d7e76efd7abdb607e07760d1174c408ac777b8be
    dangling commit 00ebfe2cb55da1b53b8638f05d65c519124f5230
    dangling commit 38f10c18b85bd490103889e8a4f137c4c070ba09
    dangling commit bd01415600d014a62dce1759f15593ee30dfbb46
    dangling commit f9045b1a8faca4978cfe7d28a54b3de6be23069a
    dangling commit 1b08130507236e1367912c85ffbe99ddb5cc4bd6
    dangling commit 4109f7f1225599fa0775e4329193a8d70490abf7
    dangling commit 8c1299e09a1488b48e63d128f4549d22c73318bc
    dangling commit ec1aa5adcf52edd7b27b14a889bf1adc67c9ef74
    dangling commit 1b214350911b94815f7fbf413f2ce413160a5427
    dangling commit 9c238bcafbb9afd586e15e6004a3354ae5f62c8c
    dangling commit 5d2e5321b17454fff9d5e95aa63b001da2c5eafa
    dangling commit 373427eef7f8777c717a995370e68a26878206af
    dangling commit 3f37a56ba9fc7b737c0e133f20536661368edcb4
    dangling commit 5b395f71ad1517011db7114447035d0a8ffb4419
    dangling commit d0424b069ce30a1aca557e556f69f98addafa96d
    dangling commit 7946f18a4c5a376368e0f4a901cf5a516748a540
    dangling commit f948e53f01fe106b45a37d5d923118e74b782e5e
    dangling commit 7f4a4bfb8231debdc1503a23cfe0bff2920ebe6e
    dangling commit 5b4dc9b57f7aab33972a5a1a46ce23f8a7be114d
    dangling commit 4b557d63b638ce5e38cf7138a8f4d129cf04e8b2
    dangling commit b655b94bdcdeb8bc4fcb23ac723a06f5d891729c
    dangling commit c35a2d378cd2ed2adb49bfa0d20ae11c34e6b713
    dangling commit e47d1f3e86a9753db39be915198b803abb42483c
    dangling commit 59860ff6bc709df4303c35d621fc28ffeec23159
    dangling commit 5287ab5046aaa227508240fd36a19d48cafcb48b
    dangling commit 988d85cfb6f61bee48870c336c925da1a9a6a52d
    dangling commit a68eedd454c9e0729f559e12e98805581940ea17
    dangling commit 238f7dbdfcc68fd3eb874a173c03645eee7465bb
    dangling commit fb91a359f44a71f2c285f520b805eb34b4deb15e
    dangling commit e2927b3386275b46f809bda32d9e97baa654c7b2
    dangling commit ff967793351527f07193d2c2b6e0a76c6e0e6fda
    dangling commit 18a04b8130f4a2539c139ede2a2ab9576b05cf2f
    dangling commit b6a011dc6df943f8a1acd44ff27bc4ce34ba6152
    dangling commit e2a4e3ec57a05c4b568bf82e5554d168f65bed77
    dangling commit 74b0f9e8d8421fec04bd5201582cdbd5de30a31c
    dangling commit 59b1c34c1385a9551f50491ab048fee299063d0a
    dangling commit 02b2b7e885ecff81bd1577c9a3ef183171f9f83c
    dangling commit d4b83593d68feb7d2ad694afcd332f02875f179e
    dangling commit 00c78d615cca621158101ea0586212cee7174a36
    dangling commit 9bc8f393151d2b825f70115057ab85677c5c7292
    dangling commit 50c99b8ad96db9eca3409ccd2ecdf8788bfac044
    dangling commit 5dca79460f9fe394bdc32e5b0d3823b114e2253a
    dangling commit adcbbb59728f767adfa76b909792c10147aae1c5
    dangling commit 4ecc850b08776a1942cc1247eb6b641b76a9939a
    dangling commit b6ccf3caf8b1792c0650270877474f8e12822188
    dangling commit ebd05d28557fec5f8590cbb0560eae67612a7f0f
    dangling commit 14d33181b4b645819aa6fe79856d96da6835ab81
    dangling commit feea41890608027537298c38f2ad888ecdd4bbc0
    dangling commit dcedadbcbac2981f89bac8b02ca64ec0d7365aba
    dangling commit 45ef75f4602fd1d5f63c97d967f1fb3e997dbdc4
    dangling commit cdf0155367aa583eec52f6014824d86379d594ff
    dangling commit 35f4f98f87ca274e0506482a76229169efa7f5b5
    dangling commit 60f4bfc284f5a2689831959bff6c4ee9453bf85b
    dangling commit 44f95796d163a063d33cb6b0e8c5a92005403a77
    $ 
    

    Cheers

    Nicolas

  2. Benjamin Wong reporter

    Here are the logs fo the two commits I'm expecting to see from the local buildbox repo:

    [bewong@buildbox aui-archive]$ git log -5 commit 844d8a27123439fa005838cb4bee233feb4b483f Author: Benjamin Wong bewong@buildbox.private.atlassian.com Date: Thu Apr 11 23:31:40 2013 -0400

    [maven-release-plugin] prepare for next development iteration
    

    commit eef50fae0a7b760633cfc153c48a0984baa6f53d Author: Benjamin Wong bewong@buildbox.private.atlassian.com Date: Thu Apr 11 23:20:38 2013 -0400

    [maven-release-plugin] prepare release auiplugin-5.1-m3
    
  3. Benjamin Wong reporter

    I get this from git fsk --full on buildbox:

    [bewong@buildbox aui-archive]$ git fsck --full
    Checking object directories: 100% (256/256), done.
    Checking objects: 100% (37211/37211), done.
    dangling tag e2205c6de3e8a8d9b12884249cdf0f035817cb42
    

    and in my local clone:

    ~/git/AUI-master master $ git fsck --full
    Checking object directories: 100% (256/256), done.
    Checking objects: 100% (42029/42029), done.
    
  4. Nicolas Venegas

    Commit 844d8a2 doesn't appear to exist on our server:

    $ git rev-list 844d8a27123439fa005838cb4bee233feb4b483f
    fatal: bad object 844d8a27123439fa005838cb4bee233feb4b483f
    $ git branch --contains 844d8a27123439fa005838cb4bee233feb4b483f
    error: malformed object name 844d8a27123439fa005838cb4bee233feb4b483f
    $ git tag --contains 844d8a27123439fa005838cb4bee233feb4b483f
    error: malformed object name 844d8a27123439fa005838cb4bee233feb4b483f
    

    If you manually push up 844d8a2 does that work?

  5. Benjamin Wong reporter

    Here's my log from build box. I think it might've just been the failed run of release:prepare, something funny happened there. I still can't seem to merge PR's though which is the actual blocker.

    I thought it was related to the release commits not being there, but that doesn't seem to be the case?
    ​ Cheers, Ben Wong Atlassian Javascript Developer

  6. Benjamin Wong reporter

    Manually pushed the commit up, PR's still seem to fail though (which is the actual reason this is a blocker). Must not have been related to the missing commit.

    Getting this error message when I try to merge in: Unable to merge An unexpected error occurred.

  7. Benjamin Wong reporter

    I tested a git pull of one of the PR's"

    ~/git/AUI-master master $ git pull git@bitbucket.org:wwalser/aui.git restfulTableEventFireMismatch
    remote: Counting objects: 131, done.
    remote: Compressing objects: 100% (66/66), done.
    remote: Total 74 (delta 35), reused 0 (delta 0)
    Unpacking objects: 100% (74/74), done.
    From bitbucket.org:wwalser/aui
     * branch            restfulTableEventFireMismatch -> FETCH_HEAD
    Merge made by the 'recursive' strategy.
     auiplugin-tests/src/main/resources/restfultable/restfultable-example.js                                              | 10 ++++++++++
     auiplugin-tests/src/main/resources/restfultable/restfultable-example.vm                                              |  2 +-
     auiplugin-tests/src/test/java/it/com/atlassian/aui/javascript/integrationTests/experimental/AUIRestfultableTest.java | 33 +++++++++++++++++++++++++++++++++
     auiplugin-tests/src/test/java/it/com/atlassian/aui/javascript/pages/RestfulTablePage.java                            |  5 ++---
     auiplugin/src/main/resources/js/atlassian/experimental-restfultable/restfultable.js                                  |  6 ++++--
     auiplugin/src/main/resources/js/atlassian/experimental-restfultable/restfultable.row.js                              |  2 +-
     6 files changed, 51 insertions(+), 7 deletions(-)
    

    it seemed to work fine although I'm not sure how bitbucket merges in PR's behind the scenes. (haven't pushed this merge yet)

  8. Log in to comment