Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

args is an array of strings #416

Merged
merged 1 commit into from
May 1, 2016
Merged

args is an array of strings #416

merged 1 commit into from
May 1, 2016

Conversation

amitsaha
Copy link
Contributor

@amitsaha amitsaha commented May 1, 2016

"args" is an array of strings, not a string.

Signed-off-by: Amit Saha amitsaha.in@gmail.com

@vbatts
Copy link
Member

vbatts commented May 1, 2016

LGTM, but the commit is not signed (try git commit -s --amend .)
Also, as a nit on the commit message, the subject line more appropriately be "config.md: args is an array of strings"

@amitsaha
Copy link
Contributor Author

amitsaha commented May 1, 2016

Thanks @vbatts , updated the diff.

Signed-off-by: Amit Saha <amitsaha.in@gmail.com>
@vbatts vbatts merged commit 45f7ada into opencontainers:master May 1, 2016
@amitsaha amitsaha deleted the config-args-doc branch May 4, 2016 01:09
@wking
Copy link
Contributor

wking commented May 7, 2016

Probably not a big deal, but there seems to have been a metadata fumble merging this PR:

$ diff -u <(git show --format=fuller bf809d3f) <(git show --format=fuller 45f7ada1)
--- /dev/fd/63  2016-05-06 22:00:22.595070249 -0700
+++ /dev/fd/62  2016-05-06 22:00:22.595070249 -0700
@@ -1,10 +1,10 @@
-commit bf809d3f27f615c1261f557641da3a92356114ed
-Author:     Amit Saha <amitsaha.in@gmail.com>
-AuthorDate: Sun May 1 23:27:07 2016 +1000
-Commit:     Amit Saha <amitsaha.in@gmail.com>
-CommitDate: Sun May 1 23:27:07 2016 +1000
+commit 45f7ada1bb62414ab5488910e30bb824cbb0f22b
+Author:     Amit Saha <amitsaha@users.noreply.github.com>
+AuthorDate: Mon May 2 00:10:56 2016 +1000
+Commit:     Vincent Batts <vbatts@hashbangbash.com>
+CommitDate: Sun May 1 10:10:56 2016 -0400

-    config.md: args is an array of strings
+    config.md: args is an array of strings (#416)

     Signed-off-by: Amit Saha <amitsaha.in@gmail.com>

It looks like @vbatts also cherry-picked and clobbered author-dates when pushing #414, #413, #410, and #406 to master without merge commits (although this is the only PR where the author email changed). I'm not sure what lead to that, and we're back to the usual GitHub merges by #422. Was that just a bad day, or is there something we can do to make PRs more easily mergable?

@vbatts
Copy link
Member

vbatts commented May 7, 2016

I was seeing that in tig the other day. I think github squash and merge
button is doing this.

On Sat, May 7, 2016 at 7:09 AM, W. Trevor King notifications@github.com
wrote:

Probably not a big deal, but there seems to have been a metadata fumble
merging this PR:

$ diff -u <(git show --format=fuller bf809d3) <(git show --format=fuller 45f7ada)
--- /dev/fd/63 2016-05-06 22:00:22.595070249 -0700
+++ /dev/fd/62 2016-05-06 22:00:22.595070249 -0700
@@ -1,10 +1,10 @@
-commit bf809d3
-Author: Amit Saha amitsaha.in@gmail.com
-AuthorDate: Sun May 1 23:27:07 2016 +1000
-Commit: Amit Saha amitsaha.in@gmail.com
-CommitDate: Sun May 1 23:27:07 2016 +1000
+commit 45f7ada
+Author: Amit Saha amitsaha@users.noreply.github.com
+AuthorDate: Mon May 2 00:10:56 2016 +1000
+Commit: Vincent Batts vbatts@hashbangbash.com
+CommitDate: Sun May 1 10:10:56 2016 -0400

Signed-off-by: Amit Saha amitsaha.in@gmail.com

It looks like @vbatts https://github.com/vbatts also cherry-picked and
clobbered author-dates when pushing #414
#414, #413
#413, #410
#410, and #406
#406 to master
without merge commits (although this is the only PR where the author email
changed). I'm not sure what lead to that, and we're back to the usual
GitHub merges by #422
#422. Was that just
a bad day, or is there something we can do to make PRs more easily mergable?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#416 (comment)

Mashimiao pushed a commit to Mashimiao/specs that referenced this pull request Aug 19, 2016
Signed-off-by: Amit Saha <amitsaha.in@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants