[Oisf-devel] force updated master

[Eric Leblond]

Hi,

On Fri, 2018-07-13 at 10:40 +0200, Victor Julien wrote:
> I was made aware last night that I let slip in some commits w/o 

Should read "we did let slip" as PR with merged code has been public
and given some time for validation.

BR,
--
Eric

> proper
> commit messages:
> 
> commit 5dff077278808b09cc558242ec0f620ef0d249dc
> Author: Victor Julien <victor at inliniac.net>
> Date:   Thu Jun 28 16:41:48 2018 +0200
> 
>     WIP detect: reload-rules shouldn't reload a stub
> 
> commit 4e662157c88a05a8d9a3c3f4579b888598d1f96d
> Author: Victor Julien <victor at inliniac.net>
> Date:   Thu Jun 28 16:31:40 2018 +0200
> 
>     WIP fixes
> 
> I have decided to fix those up, but this will mess up master as I
> force
> updating it.
> 
> Rebasing is now a bit more involved. For example with pr/3420:
> 
> get fetch origin
> git checkout pr/3420 -b fix/pr/3420
> git rebase origin/master -i
> 
> This will show the 2 bad patches in the patch list:
> 
> pick 4e66215 WIP fixes
> pick 5dff077 WIP detect: reload-rules shouldn't reload a stub
> pick 513ca78 app-layer-parser: don't overwrite stream_depth value
> pick 3de54d2 app-layer-htp: use file-store.stream-depth
> pick fc59196 doc: update file-extraction section
> pick 99f98b7 app-layer-htp: close file with TRUNCATE state
> pick 2841494 stream-tcp: fix typo in debug message
> pick 6b92291 stream-tcp: honor bypass when protocol is not found
> pick 2efa979 stream-tcp: more agressive bypass
> pick ca7465e flow: add pkts bypassed counter
> 
> Now remove the 2 top lines, save, and exit your editor. It should say
> something like:
> 
> Successfully rebased and updated refs/heads/fix/pr/3420.
> 
> This should give you a clean tree again.
> 
> Sorry for the inconvenience.
> 
-- 
Eric Leblond <eric at regit.org>