fix bash arg array processing in adam-submit #972

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
4 participants
@ryan-williams
Member

ryan-williams commented Mar 22, 2016

fixes #971

@AmplabJenkins

This comment has been minimized.

Show comment
Hide comment
@AmplabJenkins

AmplabJenkins Mar 22, 2016

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/ADAM-prb/1110/
Test PASSed.

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/ADAM-prb/1110/
Test PASSed.

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Mar 22, 2016

Member

LGTM, thank you!

Member

heuermh commented Mar 22, 2016

LGTM, thank you!

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Mar 22, 2016

Member

Merged in commit 5d3cdb7

Member

heuermh commented Mar 22, 2016

Merged in commit 5d3cdb7

@heuermh heuermh closed this Mar 22, 2016

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Mar 22, 2016

Member

Hmm. Now why does it say "This pull request is closed, but the args branch has unmerged commits."?

I'm using scripts/commit-pr.sh and sometimes it seems to do the right thing and sometimes not.

Member

heuermh commented Mar 22, 2016

Hmm. Now why does it say "This pull request is closed, but the args branch has unmerged commits."?

I'm using scripts/commit-pr.sh and sometimes it seems to do the right thing and sometimes not.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Mar 22, 2016

Member

Did the commit get rebased by the commit-pr.sh script? If so, the git commit hash changes and Github shows the "unmerged commits" message.

Member

fnothaft commented Mar 22, 2016

Did the commit get rebased by the commit-pr.sh script? If so, the git commit hash changes and Github shows the "unmerged commits" message.

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Mar 22, 2016

Member

Not sure. Closing in on the limits of my git knowledge.

$ ./scripts/commit-pr.sh 972
Current branch master is up to date.
From https://github.com/bigdatagenomics/adam
 * [new ref]         refs/pull/972/head -> pr-972
Switched to branch 'pr-972'
First, rewinding head to replay your work on top of it...
Applying: fix bash arg array processing in adam-submit
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Updating a505bb9..5d3cdb7
Fast-forward
 bin/adam-submit | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 557 bytes | 0 bytes/s, done.
Total 4 (delta 2), reused 1 (delta 0)
To https://github.com/bigdatagenomics/adam.git
   a505bb9..5d3cdb7  master -> master
Member

heuermh commented Mar 22, 2016

Not sure. Closing in on the limits of my git knowledge.

$ ./scripts/commit-pr.sh 972
Current branch master is up to date.
From https://github.com/bigdatagenomics/adam
 * [new ref]         refs/pull/972/head -> pr-972
Switched to branch 'pr-972'
First, rewinding head to replay your work on top of it...
Applying: fix bash arg array processing in adam-submit
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Updating a505bb9..5d3cdb7
Fast-forward
 bin/adam-submit | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 557 bytes | 0 bytes/s, done.
Total 4 (delta 2), reused 1 (delta 0)
To https://github.com/bigdatagenomics/adam.git
   a505bb9..5d3cdb7  master -> master
@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Mar 22, 2016

Member

This line:

First, rewinding head to replay your work on top of it...

is the rebase occuring.

Member

fnothaft commented Mar 22, 2016

This line:

First, rewinding head to replay your work on top of it...

is the rebase occuring.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment