Skip to content

Instantly share code, notes, and snippets.

@ChALkeR
Last active January 11, 2018 17:58
Show Gist options
  • Save ChALkeR/48ba49e5726b554a6b88d404758c483a to your computer and use it in GitHub Desktop.
Save ChALkeR/48ba49e5726b554a6b88d404758c483a to your computer and use it in GitHub Desktop.
Multiple git authors test
[chalker@yoga ecma262]$ git checkout bmeck/asi-hazard -b asi-hazard
Ветка «asi-hazard» отслеживает внешнюю ветку «asi-hazard» из «bmeck».
Переключено на новую ветку «asi-hazard»
[chalker@yoga ecma262]$ git show
commit 51db6904a09444348e8054a75d6f4835e4fe88aa (HEAD -> asi-hazard, bmeck/asi-hazard)
Author: Daniel Ehrenberg <[email protected]>
Date: Thu Jan 11 08:59:57 2018 -0600
Editorial: Add Automatic Semicolon Insertion hazard clause
diff --git a/spec.html b/spec.html
index b552ed8..817cdb9 100644
--- a/spec.html
+++ b/spec.html
@@ -10998,6 +10998,7 @@
<!-- es6num="11.9.2" -->
<emu-clause id="sec-examples-of-automatic-semicolon-insertion">
<h1>Examples of Automatic Semicolon Insertion</h1>
+ <em>This section is non-normative.</em>
<p>The source</p>
<pre><code class="javascript">{ 1 2 } 3</code></pre>
<p>is not a valid sentence in the ECMAScript grammar, even with the automatic semicolon insertion rules. In contrast, the source</p>
@@ -11059,6 +11060,26 @@
<p>In the circumstance that an assignment statement must begin with a left parenthesis, it is a good idea for the programmer to provide an explicit semicolon at the end of the preceding statement rather than to rely on automatic semicolon insertion.</p>
</emu-clause>
</emu-clause>
+ <emu-clause id="sec-hazards-of-automatic-semicolon-insertion">
[chalker@yoga ecma262]$ git cat-file -p 51db6904a09444348e8054a75d6f4835e4fe88aa > commit
[chalker@yoga ecma262]$ kate commit
[chalker@yoga ecma262]$ cat commit
tree 4849be6eb83086e3ed61b062f184c1e0f3f0e054
parent 7e94e28e6b446e794a223187859b715a44638dea
author Daniel Ehrenberg <[email protected]> 1515682797 -0600
author Mathias Bynens <[email protected]> 1515682797 -0600
author Kevin Gibbons <[email protected]> 1515682797 -0600
committer Bradley Farias <[email protected]> 1515688704 -0600
Editorial: Add Automatic Semicolon Insertion hazard clause
[chalker@yoga ecma262]$ git hash-object -t commit -w commit
35a607be5d29a62434879df11e300c7a189e1203
[chalker@yoga ecma262]$ git reset 35a607be5d29a62434879df11e300c7a189e1203
[chalker@yoga ecma262]$ git push --set-upstream origin asi-hazard^C
[chalker@yoga ecma262]$ git show
commit 35a607be5d29a62434879df11e300c7a189e1203 (HEAD -> asi-hazard)
Author: Daniel Ehrenberg <[email protected]>
Date: Thu Jan 11 08:59:57 2018 -0600
Author: Mathias Bynens <[email protected]>
Date: Thu Jan 11 08:59:57 2018 -0600
Author: Kevin Gibbons <[email protected]>
Date: Thu Jan 11 08:59:57 2018 -0600
Editorial: Add Automatic Semicolon Insertion hazard clause
diff --git a/spec.html b/spec.html
index b552ed8..817cdb9 100644
--- a/spec.html
+++ b/spec.html
@@ -10998,6 +10998,7 @@
<!-- es6num="11.9.2" -->
<emu-clause id="sec-examples-of-automatic-semicolon-insertion">
<h1>Examples of Automatic Semicolon Insertion</h1>
+ <em>This section is non-normative.</em>
<p>The source</p>
<pre><code class="javascript">{ 1 2 } 3</code></pre>
<p>is not a valid sentence in the ECMAScript grammar, even with the automatic semicolon insertion rules. In contrast, the source</p>
@@ -11059,6 +11060,26 @@
<p>In the circumstance that an assignment statement must begin with a left parenthesis, it is a good idea for the programmer to provide an explicit semicolon at the end [chalker@yoga ecma262]$ git push --set-upstream origin asi-hazard
Enter passphrase for key '/home/chalker/.ssh/id_rsa_2016':
Подсчет объектов: 3, готово.
Delta compression using up to 4 threads.
Сжатие объектов: 100% (3/3), готово.
Запись объектов: 100% (3/3), 1.46 KiB | 1.46 MiB/s, готово.
Total 3 (delta 2), reused 0 (delta 0)
remote: error: object 35a607be5d29a62434879df11e300c7a189e1203: multipleAuthors: invalid format - multiple 'author' lines
remote: fatal: Error in object
error: сбой при внешней распаковке index-pack abnormal exit
To github.com:ChALkeR/ecma262.git
! [remote rejected] asi-hazard -> asi-hazard (failed)
error: не удалось отправить некоторые ссылки в «[email protected]:ChALkeR/ecma262.git»
[chalker@yoga ecma262]$ git fsck
Проверка каталогов объектов: 100% (256/256), готово.
error in commit 35a607be5d29a62434879df11e300c7a189e1203: multipleAuthors: invalid format - multiple 'author' lines
Проверка объектов: 100% (3460/3460), готово.
[chalker@yoga ecma262]$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment