I see your point, and I'll explore that avenue.
Personally, I like the idea that one could also use the short hash if
the custom instruction started with "%h ", but I see the value in
leaving the variable blank.
After running the tests with a custom format enabled, I did find that
autosquash doesn't work, so I am working to correct that.
On Tue, Jun 9, 2015 at 5:36 AM, Johannes Schindelin
<johannes.schinde...@gmx.de> wrote:
> Hi,
>
> On 2015-06-08 23:00, Michael Rappazzo wrote:
>
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> index dc3133f..b92375e 100644
>> --- a/git-rebase--interactive.sh
>> +++ b/git-rebase--interactive.sh
>> @@ -977,7 +977,9 @@ else
>> revisions=$onto...$orig_head
>> shortrevisions=$shorthead
>> fi
>> -git rev-list $merges_option --pretty=oneline --reverse --left-right
>> --topo-order \
>> +format=$(git config --get rebase.instructionFormat)
>> +# the 'rev-list .. | sed' requires %m to parse; the instruction
>> requires %H to parse
>> +git rev-list $merges_option --format="%m%H ${format-%s}" --reverse
>> --left-right --topo-order \
>
> These two lines are too long (longer than 80 columns)...
>
> Besides, are you sure you don't want to substitute an empty
> 'rebase.instructionFormat' by '%s'? I would have expected to read
> `${format:-%s}` (note the colon), but then, this was Junio's suggestion...
> Junio, what do you think, should we not rather substitute empty values by
> `%s` as if the config setting was unset?
>
>> $revisions ${restrict_revision+^$restrict_revision} | \
>> sed -n "s/^>//p" |
>> while read -r sha1 rest
>
> Ciao,
> Johannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
