Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: [PATCH 1/2] filter-branch: Simplify parent computation.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:15

Johannes Sixt [off-list ref] writes:
quoted hunk ↗ jump to hunk
@@ -332,18 +321,19 @@ mkdir ../map # map old->new commit ids for rewriting 
parents
 
Crap.  Why is this patch line-wrapped X-<.
... 
 i=0
-while read commit; do
+while read commit parents; do
 	i=$(($i+1))
 	printf "\rRewriting commits... ($i/$commits)"
 
Crap.  Where did that "\rRewriting commits..." come from?
The other Johannes had the same in his patch.
quoted hunk ↗ jump to hunk
@@ -398,7 +388,7 @@ while read commit; do
 		done > ../map/$commit
 done <../revs
 
-src_head=$(tail -n 1 ../revs)
+src_head=$(tail -n 1 ../revs | sed -e 's/ .*//')
 target_head=$(head -n 1 ../map/$src_head)
 case "$target_head" in
 '')
Crap.  I seem to have "tee" there that stores them to ../map/$commit.

Anyway, I've manually fixed up the offending three patches (two
from you and one from the other Johannes) and pushed the results
out on 'next'.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help