Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- sean@sspencer10:/2TB_HDD/Sean/github/htc/android_kernel_htc_msm8996$ ./find_mini mum_tag.sh -d ../msm-3.18/ -r origin -t *LA\.UM\.*8x96*[0-9]
- + VERBOSE=0
- + '[' x-d == x ']'
- + '[' -d '!=' '' ']'
- + case $1 in
- + shift
- + REPO_DIR=../msm-3.18/
- + shift
- + '[' -r '!=' '' ']'
- + case $1 in
- + shift
- + REMOTE=origin
- + shift
- + '[' -t '!=' '' ']'
- + case $1 in
- + shift
- + TAG_REGEXP='*LA.UM.*8x96*[0-9]'
- + shift
- + '[' '' '!=' '' ']'
- + BEST_TAG=
- + BEST_COUNT=246913578246644640
- + '[' x../msm-3.18/ == x ']'
- + '[' x == x ']'
- + REPORT_OUT_FILE=/dev/stdout
- + '[' 'x*LA.UM.*8x96*[0-9]' == x ']'
- + echo 'Merge report'
- Merge report
- + echo -e '============\n'
- ============
- + '[' 0 -ne 1 ']'
- + git -C ../msm-3.18/ fetch -t origin
- ++ sed 's/[ \t]\+/ /g'
- ++ git -C ../msm-3.18/ ls-remote --tags origin '*LA.UM.*8x96*[0-9]'
- ++ cut '-d ' -f2
- + TAGS='refs/tags/LA.UM.5.5.c1-00600-8x96.0
- refs/tags/LA.UM.5.5.c1-01600-8x96.0
- refs/tags/LA.UM.5.5.c1-02900-8x96.0
- refs/tags/LA.UM.5.5.c1-06000-8x96.0
- refs/tags/LA.UM.5.5.c1-07000-8x96.0
- refs/tags/LA.UM.5.5.c1-08900-8x96.0
- refs/tags/LA.UM.5.5.c1-13900-8x96.0
- refs/tags/LA.UM.5.5.r1-00100-8x96.0
- refs/tags/LA.UM.5.5.r1-00300-8x96.0
- refs/tags/LA.UM.5.5.r1-00500-8x96.0
- refs/tags/LA.UM.5.5.r1-00800-8x96.0
- refs/tags/LA.UM.5.5.r1-00900-8x96.0
- refs/tags/LA.UM.5.5.r1-01300-8x96.0
- refs/tags/LA.UM.5.5.r1-01600-8x96.0
- refs/tags/LA.UM.5.5.r1-01800-8x96.0
- refs/tags/LA.UM.5.5.r1-02200-8x96.0
- refs/tags/LA.UM.5.5.r1-02300-8x96.0
- refs/tags/LA.UM.5.5.r1-02500-8x96.0
- refs/tags/LA.UM.5.5.r1-02800-8x96.0
- refs/tags/LA.UM.5.5.r1-03400-8x96.0
- refs/tags/LA.UM.5.5.r1-03600-8x96.0
- refs/tags/LA.UM.5.5.r1-03800-8x96.0
- refs/tags/LA.UM.5.5.r1-04000-8x96.0
- refs/tags/LA.UM.5.5.r1-04300-8x96.0
- refs/tags/LA.UM.5.5.r1-04600-8x96.0
- refs/tags/LA.UM.5.5.r1-04700-8x96.0
- refs/tags/LA.UM.5.5.r1-04900-8x96.0
- refs/tags/LA.UM.5.5.r1-05100-8x96.0
- refs/tags/LA.UM.5.5.r1-05300-8x96.0
- refs/tags/LA.UM.5.5.r1-05400-8x96.0
- refs/tags/LA.UM.5.5.r1-05700-8x96.0
- refs/tags/LA.UM.5.5.r1-05800-8x96.0
- refs/tags/LA.UM.5.5.r1-06100-8x96.0
- refs/tags/LA.UM.5.5.r1-06300-8x96.0
- refs/tags/LA.UM.5.5.r1-06400-8x96.0
- refs/tags/LA.UM.5.5.r1-06700-8x96.0
- refs/tags/LA.UM.5.5.r1-07100-8x96.0
- refs/tags/LA.UM.5.5.r1-08000-8x96.0
- refs/tags/LA.UM.5.5.r1-09000-8x96.0
- refs/tags/LA.UM.6.5.r1-02500-8x96.0
- refs/tags/LA.UM.6.5.r1-03000-8x96.0
- refs/tags/LA.UM.6.5.r1-03400-8x96.0
- refs/tags/LA.UM.6.5.r1-04000-8x96.0
- refs/tags/LA.UM.6.5.r1-04100-8x96.0
- refs/tags/LA.UM.6.5.r1-04300-8x96.0
- refs/tags/LA.UM.6.5.r1-05300-8x96.0
- refs/tags/LA.UM.6.5.r1-06000-8x96.0
- refs/tags/LA.UM.6.5.r1-06300-8x96.0
- refs/tags/LA.UM.6.5.r1-06600-8x96.0
- refs/tags/LA.UM.6.5.r1-06700-8x96.0
- refs/tags/LA.UM.6.5.r1-07400-8x96.0
- refs/tags/LA.UM.6.5.r1-08500-8x96.0
- refs/tags/LA.UM.6.5.r1-08900-8x96.0
- refs/tags/LA.UM.6.5.r1-09300-8x96.0
- refs/tags/LA.UM.6.5.r1-09600-8x96.0
- refs/tags/LA.UM.6.5.r1-09800-8x96.0
- refs/tags/LA.UM.7.5.r1-02200-8x96.0
- refs/tags/LA.UM.7.5.r1-02500-8x96.0
- refs/tags/LA.UM.7.5.r1-03100-8x96.0
- refs/tags/LA.UM.7.5.r1-03700-8x96.0'
- + for tag in '${TAGS}'
- + '[' 0 -ne 1 ']'
- + git -C ../msm-3.18/ fetch origin refs/tags/LA.UM.5.5.c1-00600-8x96.0
- + git -C ../msm-3.18/ clean -df
- + git -C ../msm-3.18/ pull --no-commit origin refs/tags/LA.UM.5.5.c1-00600-8x96.0 --allow-unrelated-histories
- ++ git -C ../msm-3.18/ status
- ++ egrep 'both modified|both added'
- ++ wc -l
- + conflict_count=0
- + git -C ../msm-3.18/ merge --abort
- + echo -e '\tTag refs/tags/LA.UM.5.5.c1-00600-8x96.0 has 0 conflicts.'
- Tag refs/tags/LA.UM.5.5.c1-00600-8x96.0 has 0 conflicts.
- + '[' 0 -le 246913578246644640 ']'
- + BEST_TAG=refs/tags/LA.UM.5.5.c1-00600-8x96.0
- + BEST_COUNT=0
- + for tag in '${TAGS}'
- + '[' 0 -ne 1 ']'
- + git -C ../msm-3.18/ fetch origin refs/tags/LA.UM.5.5.c1-01600-8x96.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement