Opened 6 years ago

Closed 6 years ago

Last modified 6 years ago

#9863 closed task (fixed)

Move websocket-transport to its own repo

Reported by: dcf Owned by: asn
Priority: Medium Milestone:
Component: Obfuscation/Pluggable transport Version:
Severity: Keywords: flashproxy
Cc: infinity0 Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

#9831 created /pluggable-transports/websocket.git. Let's move /flashproxy.git/websocket-transport there.

If I remember correctly, the procedure goes something like

  1. Clone your local flashproxy repo and put it in a directory called websocket.
  2. In the new websocket directory, run
    git filter-branch --subdirectory-filter websocket-transport -- --all
    
    (Check the man page for git-filter-branch.)
  3. Check the new history and make sure it looks right and makes sense. It might be worth doing git log -C -M --stat websocket-transport in the flashproxy repo to check if any files might have lived in another directory at some point.
  4. Add a remote that points to the new /pluggable-transports/websocket.git.
  5. Push to the new remote.

I think it makes sense to move doc/websocket-transport.txt into the new repo as well, and update references to it in the flashproxy source code.

Child Tickets

Change History (5)

comment:1 Changed 6 years ago by infinity0

I've done this, also added the --prune-empty flag to get rid of unrelated commits.

Just waiting on ssh public key to update so I can push.

comment:2 Changed 6 years ago by infinity0

Resolution: fixed
Status: newclosed

comment:3 Changed 6 years ago by dcf

I just want to add that -- -all is not the right thing to do in the ticket description. It causes all refs to be rewritten, which is not what we want in this case.

comment:4 Changed 6 years ago by infinity0

Well, only the master branch has commits to that subdirectory, and --prune-empty got rid of the empty commits that would have otherwise been created on other branches, so the end result was the same. :)

comment:5 in reply to:  4 Changed 6 years ago by dcf

Replying to infinity0:

Well, only the master branch has commits to that subdirectory, and --prune-empty got rid of the empty commits that would have otherwise been created on other branches, so the end result was the same. :)

Actually I just made the note here because I tried a similar command for another purpose and screwed up all my local branches :) I want to at least leave a note in case someone in the future uses the ticket description as a guideline. (I couldn't figure out how to edit the ticket description.)

Note: See TracTickets for help on using tickets.