git - Autofixup consecutive commits of same message and author (of the complete repo) -

-

I have transferred a large SVN repository to GIT and there are several drawbacks with the same message from the same author. / P>

Now I want to command myself in a single commitment.

Thoughts?

I was finally able to annoy the problem, as always, it was a human error.

I've written the script available here for Bash, but as I use it should not be a problem.

This script is, I will explain it in detail below: 

  #! / Bin / bash Author = "$ GIT_AUTHOR_NAME & lt; $ GIT_AUTHOR_EMAIL & gt;" Msg = "$ (cat)" tree = "$ 1" parent = () change in time of change ": p:" opt. What to do $ opt in p) Parent = ($ {parent] $ OPTARG ;;?) Echo "invalid option: - $ OPTARG" & gt; And 2 exit 1 ;; ASAC has created _parents_pection () {For parents = "$ @" Do_author () {git log -1 - format = "% AN & lieutenant" = "- p $ parent";% AE> "$ 1} Squash_it () {If ["x $ author" == "x $ (get_author $ 1)"] & amp; Amp; ["X $ msg" == "x $ (get_msg $ 1)"]; Then git read-tree -m - offensive $ {1} ^ {tree} $ tree & gt; / Dev / null tree = $ (git write-tree) = parent = ($ (git log-format =% p-1 $ 1)) FI} if [[$ $ # parents [@]} == 1]]; Then squash_armmit $ {parent} [0]} commit-tree $ tree $ (create_parents_option $ {parent-father [@]} -m "$ msg"   
 You can execute through:  
  GIT filter-branch --Amet-filter "$ (cat / path / to / d / script)"   
 
 The script will be checked that the current commitment was made with the same author and the same message as before.  
 If it is so, then it will merge the current commitment tree, before using the  git read-tree -m  merge into trees given with the change and Writes the result in the index. Later,  git write-tree  is used to create a new tree with the merged results on the index.  
 Then set the script to the parent of the current comment on the parents of the parent of the comment merged, effectively removing this "deletion" from history.  
 If you have any more questions then I'm happy to help. It was fun to work on!  
  Edit:  I have tested this script with msysgit version 1.9.2 on Windows 7.

Comments

Post a Comment

Popular posts from this blog

php - PDO bindParam() fatal error -

-
I am trying to learn PDO, now I have written this small code, but it gives me a serious error: < P> Fatal error: Call a member function at a non-object dot () ... $ con = new mysqli ("127.0.0.1", "root", "", "csvdangercheck"); $ Query = $ con- & gt; ("Id,` var1`, `var2`) values ​​(" id,: var1,: var2) ";); $ query- & gt; bypass pattern (': id', $ id); $ query- & gt; BindParam (': var1', $ VAL1); $ Query- & gt; bindParam (': var2', $ val2); $ Query-> Executed (); I Trying to use print_r ($ con-> errorInfo ()) but Fatal error: Undefined method mysqli :: errorInfo ( ) ... can someone tell me what am I missing? Flaffeh said, you have PDO Missing Mysqy, try it: $ con = new PDO ('mysql: host = 127.0.0.1; dbname = csvdangercheck', 'root', '');
Read more

logging - How can I log both the Request.InputStream and Response.OutputStream traffic in my ASP.NET MVC3 Application for specific Actions? -

-
For a specific set of tasks, I need to log in to the incoming request inputstream as well as outgoing response. is. I am using an ActionFilterAttribute for this and overriding the OnActionExecuted and OnResultExecuted methods. So I'm starting with this idea ... Public category ActionLoggerAttribute: ActionFilterArrbit {Public Override Zero On-Offed Execution (ActionActioned Contact Filter Filter) {base.OnActionAxecuted (FilterContext); HttpRequestBase request = filterContext.HttpContext.Request; // TODO: Log the request. InputStream} Public Override Zero OnResultExecuted (ResultExecutedContext FilterContext) {base.OnResultExecuted (filterContext); HTTPRPSPointBase Response = FilterContacts Hpptex response; // TODO: Log on Response.OutputStream}} Ideally I'll hook it up with enterprise library logging because I'm already using it for error logging. Am I reaching the input and output stream at the right time? Can I easily use the Enterprise Library to log i
Read more

java - Why my included JSP file won't get processed correctly? -

-
I am trying to create Java web framework (and learning), and on the basis of 'Code Generator In the process of making the material view of the database in the process of development, I stumbled into a difficulty, which I do not know how to solve it. First of all, I want the following index.jsp : & lt; Body & gt; Use all pages to be created. & Lt;% @ include file = "header.jsp"% & gt; & Lt; Hours / & gt; & Lt;% @ included file = "body.jsp"%> & Lt; Hours / & gt; & Lt;% @ include file = "footer.jsp"% & gt; & Lt; / Body & gt; And, in body.jsp , I should have it like this: & lt; Jsp: include page = "$ {Application_modul}"%> Where application_modul is an attribute defined in its controller: request.setAttribute ("application_modul", "USER_ACCOUNT \\ ' View_user_account.jsp "); This file can be found properly, but the processed JSP does
Read more