search

riptano / ccm

A script to easily create and destroy an Apache Cassandra cluster on localhost
Apache License 2.0
1.22k stars 303 forks source link

Handle branch divergences in git cache more appropriately #582

Closed ptnapoleon closed 7 years ago

ptnapoleon commented 7 years ago

@jkni (and @djbowers ) to review please. I'll run some CI to make sure this doesn't break anything.

ptnapoleon commented 7 years ago

http://cassci.datastax.com/view/Dev/view/ptnapoleon/job/ptnapoleon-test-trunk-dtest/3/console

djbowers commented 7 years ago

Looks good to me. But I did find what looks like a type above the new code you wrote. Line 210 looks like it has an extra open bracket. if str(status).find('[behind') > -1:

ptnapoleon commented 7 years ago

It is not a typo. At that point the value of status looks like '## cassandra-2.2...origin/cassandra-2.2 [behind 9]\n' and thus we expect the [. If we didn't have that, branches with the word behind in the name would always break

ptnapoleon commented 7 years ago

Hard -1 on this, up-to-date is never printed in status -sb

ptnapoleon commented 7 years ago

Okay, needs a new review

ptnapoleon commented 7 years ago

http://cassci.datastax.com/view/Dev/view/ptnapoleon/job/ptnapoleon-test-trunk-dtest/4/