@@ -83,9 +83,41 @@ to git/git, and Lars has since posted
83
83
so an interesting way to test patchs will perhaps be available soon
84
84
to Git developers.
85
85
86
- <!-- -
86
+
87
87
### Support
88
- -->
88
+
89
+ * [ 2.6.0: Comment in rebase instruction has become too rigid] ( http://thread.gmane.org/gmane.comp.version-control.git/278824 )
90
+
91
+ Shortly after git version 2.6.0 was released, Nazri Ramliy noticed
92
+ that:
93
+
94
+ > the format of the comment lines in a rebase instruction sheet has
95
+ > become stricter - it could no longer begin with spaces or tabs. The
96
+ > comment char ("#" for example) has to appear on the first column.
97
+
98
+ and that this change broke his script.
99
+
100
+ As Matthieu Moy found out, the cause of the regression was a patch to
101
+ pre check the rebase instruction sheet before starting an interactive
102
+ rebase. The goal of this pre checking patch was to avoid discovering a
103
+ syntax error in the instruction sheet in the middle of a rebase.
104
+
105
+ Matthieu then posted [ a patch to fix the regression] ( http://thread.gmane.org/gmane.comp.version-control.git/278841 )
106
+ based on a suggestion by Junio Hamano. Matthieu's patch just
107
+ prefilters the instruction sheet by piping it through
108
+ ` sed 's/^[[:space:]]*//' ` .
109
+
110
+ But Junio replied that Matthieu's patch would fix one aspect of the
111
+ problems caused by the pre checking patch. There could be more
112
+ problems as the pre checking code is different from the actual parsing
113
+ when the instruction sheet is processed. Junio also said he was
114
+ tempted to revert the pre checking patch, but he provided a patch to
115
+ fix the problem anyway by using the same code in both the pre checking
116
+ step and the actual parsing.
117
+
118
+ Matthieu agreed that Junio's patch was the way to go, and after a few
119
+ more patches and emails, they agreed on a solution.
120
+
89
121
90
122
## Developer Spotlight: Luke Diamand
91
123
0 commit comments