Advertisement
deadman96385

Untitled

Dec 16th, 2018
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.89 KB | None | 0 0
  1. 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]
  2. + VERBOSE=0
  3. + '[' x-d == x ']'
  4. + '[' -d '!=' '' ']'
  5. + case $1 in
  6. + shift
  7. + REPO_DIR=../msm-3.18/
  8. + shift
  9. + '[' -r '!=' '' ']'
  10. + case $1 in
  11. + shift
  12. + REMOTE=origin
  13. + shift
  14. + '[' -t '!=' '' ']'
  15. + case $1 in
  16. + shift
  17. + TAG_REGEXP='*LA.UM.*8x96*[0-9]'
  18. + shift
  19. + '[' '' '!=' '' ']'
  20. + BEST_TAG=
  21. + BEST_COUNT=246913578246644640
  22. + '[' x../msm-3.18/ == x ']'
  23. + '[' x == x ']'
  24. + REPORT_OUT_FILE=/dev/stdout
  25. + '[' 'x*LA.UM.*8x96*[0-9]' == x ']'
  26. + echo 'Merge report'
  27. Merge report
  28. + echo -e '============\n'
  29. ============
  30.  
  31. + '[' 0 -ne 1 ']'
  32. + git -C ../msm-3.18/ fetch -t origin
  33. ++ sed 's/[ \t]\+/ /g'
  34. ++ git -C ../msm-3.18/ ls-remote --tags origin '*LA.UM.*8x96*[0-9]'
  35. ++ cut '-d ' -f2
  36. + TAGS='refs/tags/LA.UM.5.5.c1-00600-8x96.0
  37. refs/tags/LA.UM.5.5.c1-01600-8x96.0
  38. refs/tags/LA.UM.5.5.c1-02900-8x96.0
  39. refs/tags/LA.UM.5.5.c1-06000-8x96.0
  40. refs/tags/LA.UM.5.5.c1-07000-8x96.0
  41. refs/tags/LA.UM.5.5.c1-08900-8x96.0
  42. refs/tags/LA.UM.5.5.c1-13900-8x96.0
  43. refs/tags/LA.UM.5.5.r1-00100-8x96.0
  44. refs/tags/LA.UM.5.5.r1-00300-8x96.0
  45. refs/tags/LA.UM.5.5.r1-00500-8x96.0
  46. refs/tags/LA.UM.5.5.r1-00800-8x96.0
  47. refs/tags/LA.UM.5.5.r1-00900-8x96.0
  48. refs/tags/LA.UM.5.5.r1-01300-8x96.0
  49. refs/tags/LA.UM.5.5.r1-01600-8x96.0
  50. refs/tags/LA.UM.5.5.r1-01800-8x96.0
  51. refs/tags/LA.UM.5.5.r1-02200-8x96.0
  52. refs/tags/LA.UM.5.5.r1-02300-8x96.0
  53. refs/tags/LA.UM.5.5.r1-02500-8x96.0
  54. refs/tags/LA.UM.5.5.r1-02800-8x96.0
  55. refs/tags/LA.UM.5.5.r1-03400-8x96.0
  56. refs/tags/LA.UM.5.5.r1-03600-8x96.0
  57. refs/tags/LA.UM.5.5.r1-03800-8x96.0
  58. refs/tags/LA.UM.5.5.r1-04000-8x96.0
  59. refs/tags/LA.UM.5.5.r1-04300-8x96.0
  60. refs/tags/LA.UM.5.5.r1-04600-8x96.0
  61. refs/tags/LA.UM.5.5.r1-04700-8x96.0
  62. refs/tags/LA.UM.5.5.r1-04900-8x96.0
  63. refs/tags/LA.UM.5.5.r1-05100-8x96.0
  64. refs/tags/LA.UM.5.5.r1-05300-8x96.0
  65. refs/tags/LA.UM.5.5.r1-05400-8x96.0
  66. refs/tags/LA.UM.5.5.r1-05700-8x96.0
  67. refs/tags/LA.UM.5.5.r1-05800-8x96.0
  68. refs/tags/LA.UM.5.5.r1-06100-8x96.0
  69. refs/tags/LA.UM.5.5.r1-06300-8x96.0
  70. refs/tags/LA.UM.5.5.r1-06400-8x96.0
  71. refs/tags/LA.UM.5.5.r1-06700-8x96.0
  72. refs/tags/LA.UM.5.5.r1-07100-8x96.0
  73. refs/tags/LA.UM.5.5.r1-08000-8x96.0
  74. refs/tags/LA.UM.5.5.r1-09000-8x96.0
  75. refs/tags/LA.UM.6.5.r1-02500-8x96.0
  76. refs/tags/LA.UM.6.5.r1-03000-8x96.0
  77. refs/tags/LA.UM.6.5.r1-03400-8x96.0
  78. refs/tags/LA.UM.6.5.r1-04000-8x96.0
  79. refs/tags/LA.UM.6.5.r1-04100-8x96.0
  80. refs/tags/LA.UM.6.5.r1-04300-8x96.0
  81. refs/tags/LA.UM.6.5.r1-05300-8x96.0
  82. refs/tags/LA.UM.6.5.r1-06000-8x96.0
  83. refs/tags/LA.UM.6.5.r1-06300-8x96.0
  84. refs/tags/LA.UM.6.5.r1-06600-8x96.0
  85. refs/tags/LA.UM.6.5.r1-06700-8x96.0
  86. refs/tags/LA.UM.6.5.r1-07400-8x96.0
  87. refs/tags/LA.UM.6.5.r1-08500-8x96.0
  88. refs/tags/LA.UM.6.5.r1-08900-8x96.0
  89. refs/tags/LA.UM.6.5.r1-09300-8x96.0
  90. refs/tags/LA.UM.6.5.r1-09600-8x96.0
  91. refs/tags/LA.UM.6.5.r1-09800-8x96.0
  92. refs/tags/LA.UM.7.5.r1-02200-8x96.0
  93. refs/tags/LA.UM.7.5.r1-02500-8x96.0
  94. refs/tags/LA.UM.7.5.r1-03100-8x96.0
  95. refs/tags/LA.UM.7.5.r1-03700-8x96.0'
  96. + for tag in '${TAGS}'
  97. + '[' 0 -ne 1 ']'
  98. + git -C ../msm-3.18/ fetch origin refs/tags/LA.UM.5.5.c1-00600-8x96.0
  99. + git -C ../msm-3.18/ clean -df
  100. + git -C ../msm-3.18/ pull --no-commit origin refs/tags/LA.UM.5.5.c1-00600-8x96.0 --allow-unrelated-histories
  101. ++ git -C ../msm-3.18/ status
  102. ++ egrep 'both modified|both added'
  103. ++ wc -l
  104. + conflict_count=0
  105. + git -C ../msm-3.18/ merge --abort
  106. + echo -e '\tTag refs/tags/LA.UM.5.5.c1-00600-8x96.0 has 0 conflicts.'
  107. Tag refs/tags/LA.UM.5.5.c1-00600-8x96.0 has 0 conflicts.
  108. + '[' 0 -le 246913578246644640 ']'
  109. + BEST_TAG=refs/tags/LA.UM.5.5.c1-00600-8x96.0
  110. + BEST_COUNT=0
  111. + for tag in '${TAGS}'
  112. + '[' 0 -ne 1 ']'
  113. + 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