georgejr

Untitled

Jul 1st, 2019
241
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 21.24 KB | None | 0 0
  1.  
  2. Geo jr@Geo MINGW64 ~/openmrs-core (master)
  3. $ git branch
  4. * master
  5.  
  6. Geo jr@Geo MINGW64 ~/openmrs-core (master)
  7. $ git checkout -b TRUNK-4986
  8. Switched to a new branch 'TRUNK-4986'
  9.  
  10. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  11. $ git status
  12. On branch TRUNK-4986
  13. nothing to commit, working tree clean
  14.  
  15. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  16. $ git status
  17. On branch TRUNK-4986
  18. Changes not staged for commit:
  19. (use "git add <file>..." to update what will be committed)
  20. (use "git checkout -- <file>..." to discard changes in working directory)
  21.  
  22. modified: pom.xml
  23.  
  24. no changes added to commit (use "git add" and/or "git commit -a")
  25.  
  26. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  27. $ mvn clean install
  28. [INFO] Scanning for projects...
  29. [INFO] ------------------------------------------------------------------------
  30. [INFO] Reactor Build Order:
  31. [INFO]
  32. [INFO] OpenMRS
  33. [INFO] openmrs-tools
  34. [INFO] openmrs-test
  35. [INFO] openmrs-api
  36. [INFO] openmrs-web
  37. [INFO] openmrs-webapp
  38. [INFO]
  39. [INFO] ------------------------------------------------------------------------
  40. [INFO] Building OpenMRS 2.3.0-SNAPSHOT
  41. [INFO] ------------------------------------------------------------------------
  42. [INFO]
  43. [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ openmrs ---
  44. [INFO]
  45. [INFO] --- buildnumber-maven-plugin:1.1:create (default) @ openmrs ---
  46. [INFO] Checking for local modifications: skipped.
  47. [INFO] Updating project files from SCM: skipped.
  48. [INFO] ShortRevision tag detected. The value is '6'.
  49. [INFO] Executing: cmd.exe /X /C "git rev-parse --verify --short=6 HEAD"
  50. [INFO] Working directory: C:\Users\Admin\openmrs-core
  51. [INFO] Storing buildNumber: a346ec at timestamp: 1561884618079
  52. [INFO] ShortRevision tag detected. The value is '6'.
  53. [INFO] Executing: cmd.exe /X /C "git rev-parse --verify --short=6 HEAD"
  54. [INFO] Working directory: C:\Users\Admin\openmrs-core
  55. [INFO] Storing buildScmBranch: UNKNOWN
  56. [INFO]
  57. [INFO] --- build-helper-maven-plugin:1.5:parse-version (parse-version) @ openmrs ---
  58. [INFO]
  59. [INFO] --- maven-jar-plugin:2.3.2:test-jar (default) @ openmrs ---
  60. [WARNING] JAR will be empty - no content was marked for inclusion!
  61. [INFO] Building jar: C:\Users\Admin\openmrs-core\target\openmrs-2.3.0-SNAPSHOT-tests.jar
  62. [INFO]
  63. [INFO] --- license-maven-plugin:3.0:check (default) @ openmrs ---
  64. [INFO] Checking licenses...
  65. [INFO]
  66. [INFO] --- maven-install-plugin:2.4:install (default-install) @ openmrs ---
  67. [INFO] Installing C:\Users\Admin\openmrs-core\pom.xml to C:\Users\Admin\.m2\repository\org\openmrs\openmrs\2.3.0-SNAPSHOT\openmrs-2.3.0-SNAPSHOT.pom
  68. [INFO] Installing C:\Users\Admin\openmrs-core\target\openmrs-2.3.0-SNAPSHOT-tests.jar to C:\Users\Admin\.m2\repository\org\openmrs\openmrs\2.3.0-SNAPSHOT\openmrs-2.3.0-SNAPSHOT-tests.jar
  69. [INFO]
  70. [INFO] ------------------------------------------------------------------------
  71. [INFO] Building openmrs-tools 2.3.0-SNAPSHOT
  72. [INFO] ------------------------------------------------------------------------
  73. [INFO]
  74. [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ openmrs-tools ---
  75. [INFO] Deleting C:\Users\Admin\openmrs-core\tools\target
  76. [INFO]
  77. [INFO] --- buildnumber-maven-plugin:1.1:create (default) @ openmrs-tools ---
  78. [INFO]
  79. [INFO] --- build-helper-maven-plugin:1.5:parse-version (parse-version) @ openmrs-tools ---
  80. [INFO]
  81. [INFO] --- maven-resources-plugin:2.4:resources (default-resources) @ openmrs-tools ---
  82. [INFO] Using 'UTF-8' encoding to copy filtered resources.
  83. [INFO] Copying 4 resources
  84. [INFO]
  85. [INFO] --- maven-compiler-plugin:2.1:compile (default-compile) @ openmrs-tools ---
  86. [INFO] Compiling 1 source file to C:\Users\Admin\openmrs-core\tools\target\classes
  87. [INFO]
  88. [INFO] --- maven-resources-plugin:2.4:testResources (default-testResources) @ openmrs-tools ---
  89. [INFO] Using 'UTF-8' encoding to copy filtered resources.
  90. [INFO] skip non existing resourceDirectory C:\Users\Admin\openmrs-core\tools\src\test\resources
  91. [INFO]
  92. [INFO] --- maven-compiler-plugin:2.1:testCompile (default-testCompile) @ openmrs-tools ---
  93. [INFO] No sources to compile
  94. [INFO]
  95. [INFO] --- maven-surefire-plugin:2.18.1:test (default-test) @ openmrs-tools ---
  96. [INFO] No tests to run.
  97. [INFO]
  98. [INFO] --- maven-jar-plugin:2.3.2:jar (default-jar) @ openmrs-tools ---
  99. [INFO] Building jar: C:\Users\Admin\openmrs-core\tools\target\openmrs-tools-2.3.0-SNAPSHOT.jar
  100. [INFO]
  101. [INFO] --- maven-jar-plugin:2.3.2:test-jar (default) @ openmrs-tools ---
  102. [WARNING] JAR will be empty - no content was marked for inclusion!
  103. [INFO] Building jar: C:\Users\Admin\openmrs-core\tools\target\openmrs-tools-2.3.0-SNAPSHOT-tests.jar
  104. [INFO]
  105. [INFO] --- license-maven-plugin:3.0:check (default) @ openmrs-tools ---
  106. [INFO] Checking licenses...
  107. [INFO]
  108. [INFO] --- maven-install-plugin:2.4:install (default-install) @ openmrs-tools ---
  109. [INFO] Installing C:\Users\Admin\openmrs-core\tools\target\openmrs-tools-2.3.0-SNAPSHOT.jar to C:\Users\Admin\.m2\repository\org\openmrs\tools\openmrs-tools\2.3.0-SNAPSHOT\openmrs-tools-2.3.0-SNAPSHOT.jar
  110. [INFO] Installing C:\Users\Admin\openmrs-core\tools\pom.xml to C:\Users\Admin\.m2\repository\org\openmrs\tools\openmrs-tools\2.3.0-SNAPSHOT\openmrs-tools-2.3.0-SNAPSHOT.pom
  111. [INFO] Installing C:\Users\Admin\openmrs-core\tools\target\openmrs-tools-2.3.0-SNAPSHOT-tests.jar to C:\Users\Admin\.m2\repository\org\openmrs\tools\openmrs-tools\2.3.0-SNAPSHOT\openmrs-tools-2.3.0-SNAPSHOT-tests.jar
  112. [INFO]
  113. [INFO] ------------------------------------------------------------------------
  114. [INFO] Building openmrs-test 2.3.0-SNAPSHOT
  115. [INFO] ------------------------------------------------------------------------
  116. [INFO]
  117. [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ openmrs-test ---
  118. [INFO]
  119. [INFO] --- buildnumber-maven-plugin:1.1:create (default) @ openmrs-test ---
  120. [INFO]
  121. [INFO] --- build-helper-maven-plugin:1.5:parse-version (parse-version) @ openmrs-test ---
  122. [INFO]
  123. [INFO] --- maven-jar-plugin:2.3.2:test-jar (default) @ openmrs-test ---
  124. [WARNING] JAR will be empty - no content was marked for inclusion!
  125. [INFO] Building jar: C:\Users\Admin\openmrs-core\test\target\openmrs-test-2.3.0-SNAPSHOT-tests.jar
  126. [INFO]
  127. [INFO] --- license-maven-plugin:3.0:check (default) @ openmrs-test ---
  128. [INFO] Checking licenses...
  129. [INFO]
  130. [INFO] --- maven-install-plugin:2.4:install (default-install) @ openmrs-test ---
  131. [INFO] Installing C:\Users\Admin\openmrs-core\test\pom.xml to C:\Users\Admin\.m2\repository\org\openmrs\test\openmrs-test\2.3.0-SNAPSHOT\openmrs-test-2.3.0-SNAPSHOT.pom
  132. [INFO] Installing C:\Users\Admin\openmrs-core\test\target\openmrs-test-2.3.0-SNAPSHOT-tests.jar to C:\Users\Admin\.m2\repository\org\openmrs\test\openmrs-test\2.3.0-SNAPSHOT\openmrs-test-2.3.0-SNAPSHOT-tests.jar
  133. [INFO]
  134. [INFO] ------------------------------------------------------------------------
  135. [INFO] Building openmrs-api 2.3.0-SNAPSHOT
  136. [INFO] ------------------------------------------------------------------------
  137. [INFO]
  138. [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ openmrs-api ---
  139. [INFO] Deleting C:\Users\Admin\openmrs-core\api\target
  140. [INFO]
  141. [INFO] --- buildnumber-maven-plugin:1.1:create (default) @ openmrs-api ---
  142. [INFO]
  143. [INFO] --- build-helper-maven-plugin:1.5:parse-version (parse-version) @ openmrs-api ---
  144. [INFO]
  145. [INFO] --- jacoco-maven-plugin:0.8.0:prepare-agent (prepare-agent) @ openmrs-api ---
  146. [INFO] argLine set to -javaagent:C:\\Users\\Admin\\.m2\\repository\\org\\jacoco\\org.jacoco.agent\\0.8.0\\org.jacoco.agent-0.8.0-runtime.jar=destfile=C:\\Users\\Admin\\openmrs-core\\api\\target\\jacoco.exec,includes=org/openmrs/** -Duser.language=en -Duser.region=US -Xmx2g
  147. [INFO]
  148. [INFO] --- maven-java-formatter-plugin:0.3:format (default) @ openmrs-api ---
  149. [INFO] Using 'UTF-8' encoding to format source files.
  150. [INFO] Number of files to be formatted: 1031
  151. [INFO] Successfully formatted: 0 file(s)
  152. [INFO] Fail to format : 0 file(s)
  153. [INFO] Skipped : 1031 file(s)
  154. [INFO] Approximate time taken: 44s
  155. [INFO]
  156. [INFO] --- maven-resources-plugin:2.4:resources (default-resources) @ openmrs-api ---
  157. [INFO] Using 'UTF-8' encoding to copy filtered resources.
  158. [INFO] Copying 1 resource
  159. [INFO] Copying 133 resources
  160. [INFO]
  161. [INFO] --- maven-compiler-plugin:2.1:compile (default-compile) @ openmrs-api ---
  162. [INFO] Compiling 697 source files to C:\Users\Admin\openmrs-core\api\target\classes
  163. [INFO] -------------------------------------------------------------
  164. [ERROR] COMPILATION ERROR :
  165. [INFO] -------------------------------------------------------------
  166. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\databasechange\GenerateUuid.java:[109,30] error: cannot find symbol
  167.  
  168. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[24,7] error: ClassLoaderFileOpener is not abstract and does not override abstract method list(String,String,boolean,boolean,boolean) in ResourceAccessor
  169.  
  170. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[38,1] error: method does not override or implement a method from a supertype
  171.  
  172. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[43,1] error: method does not override or implement a method from a supertype
  173.  
  174. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[185,3] error: method does not override or implement a method from a supertype
  175.  
  176. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[191,9] error: method visit in class UpdateVisitor cannot be applied to given types;
  177.  
  178. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[201,57] error: incompatible types: String cannot be converted to Contexts
  179.  
  180. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[207,28] error: cannot find symbol
  181.  
  182. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[218,38] error: incompatible types: String cannot be converted to Contexts
  183.  
  184. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[219,11] error: cannot find symbol
  185.  
  186. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[220,85] error: incompatible types: Database cannot be converted to RuntimeEnvironment
  187.  
  188. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[390,11] error: cannot find symbol
  189.  
  190. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[617,63] error: incompatible types: String cannot be converted to Contexts
  191.  
  192. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[731,15] error: cannot find symbol
  193.  
  194. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[732,15] error: cannot find symbol
  195.  
  196. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[759,21] error: cannot find symbol
  197.  
  198. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\databasechange\SourceMySqldiffFile.java:[93,46] error: cannot find symbol
  199.  
  200. [INFO] 17 errors
  201. [INFO] -------------------------------------------------------------
  202. [INFO] ------------------------------------------------------------------------
  203. [INFO] Reactor Summary:
  204. [INFO]
  205. [INFO] OpenMRS ............................................ SUCCESS [ 39.699 s]
  206. [INFO] openmrs-tools ...................................... SUCCESS [ 5.369 s]
  207. [INFO] openmrs-test ....................................... SUCCESS [ 4.267 s]
  208. [INFO] openmrs-api ........................................ FAILURE [01:52 min]
  209. [INFO] openmrs-web ........................................ SKIPPED
  210. [INFO] openmrs-webapp ..................................... SKIPPED
  211. [INFO] ------------------------------------------------------------------------
  212. [INFO] BUILD FAILURE
  213. [INFO] ------------------------------------------------------------------------
  214. [INFO] Total time: 02:42 min
  215. [INFO] Finished at: 2019-06-30T11:52:56+03:00
  216. [INFO] Final Memory: 42M/191M
  217. [INFO] ------------------------------------------------------------------------
  218. [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.1:compile (default-compile) on project openmrs-api: Compilation failure: Compilation failure:
  219. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\databasechange\GenerateUuid.java:[109,30] error: cannot find symbol
  220. [ERROR]
  221. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[24,7] error: ClassLoaderFileOpener is not abstract and does not override abstract method list(String,String,boolean,boolean,boolean) in ResourceAccessor
  222. [ERROR]
  223. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[38,1] error: method does not override or implement a method from a supertype
  224. [ERROR]
  225. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\ClassLoaderFileOpener.java:[43,1] error: method does not override or implement a method from a supertype
  226. [ERROR]
  227. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[185,3] error: method does not override or implement a method from a supertype
  228. [ERROR]
  229. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[191,9] error: method visit in class UpdateVisitor cannot be applied to given types;
  230. [ERROR]
  231. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[201,57] error: incompatible types: String cannot be converted to Contexts
  232. [ERROR]
  233. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[207,28] error: cannot find symbol
  234. [ERROR]
  235. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[218,38] error: incompatible types: String cannot be converted to Contexts
  236. [ERROR]
  237. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[219,11] error: cannot find symbol
  238. [ERROR]
  239. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[220,85] error: incompatible types: Database cannot be converted to RuntimeEnvironment
  240. [ERROR]
  241. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[390,11] error: cannot find symbol
  242. [ERROR]
  243. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[617,63] error: incompatible types: String cannot be converted to Contexts
  244. [ERROR]
  245. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[731,15] error: cannot find symbol
  246. [ERROR]
  247. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[732,15] error: cannot find symbol
  248. [ERROR]
  249. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\DatabaseUpdater.java:[759,21] error: cannot find symbol
  250. [ERROR]
  251. [ERROR] \Users\Admin\openmrs-core\api\src\main\java\org\openmrs\util\databasechange\SourceMySqldiffFile.java:[93,46] error: cannot find symbol
  252. [ERROR] -> [Help 1]
  253. [ERROR]
  254. [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
  255. [ERROR] Re-run Maven using the -X switch to enable full debug logging.
  256. [ERROR]
  257. [ERROR] For more information about the errors and possible solutions, please read the following articles:
  258. [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
  259. [ERROR]
  260. [ERROR] After correcting the problems, you can resume the build with the command
  261. [ERROR] mvn <goals> -rf :openmrs-api
  262.  
  263. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  264. $ git add -i
  265. staged unstaged path
  266. 1: unchanged +1/-1 pom.xml
  267.  
  268. *** Commands ***
  269. 1: status 2: update 3: revert 4: add untracked
  270. 5: patch 6: diff 7: quit 8: help
  271. What now> 2
  272. staged unstaged path
  273. 1: unchanged +1/-1 pom.xml
  274. Update>> 1
  275. staged unstaged path
  276. * 1: unchanged +1/-1 pom.xml
  277. Update>> 1
  278. staged unstaged path
  279. * 1: unchanged +1/-1 pom.xml
  280. Update>>
  281. updated 1 path
  282.  
  283. *** Commands ***
  284. 1: status 2: update 3: revert 4: add untracked
  285. 5: patch 6: diff 7: quit 8: help
  286. What now> 6
  287. staged unstaged path
  288. 1: +1/-1 nothing pom.xml
  289. Review diff>> 1
  290. diff --git a/pom.xml b/pom.xml
  291. index 9f2970dbd..a5cb9d61f 100644
  292. --- a/pom.xml
  293. +++ b/pom.xml
  294. @@ -278,7 +278,7 @@
  295. <dependency>
  296. <groupId>org.liquibase</groupId>
  297. <artifactId>liquibase-core</artifactId>
  298. - <version>2.0.5</version>
  299. + <version>3.5.0</version>
  300. </dependency>
  301. <dependency>
  302. <groupId>org.openmrs.liquibase.ext</groupId>
  303. *** Commands ***
  304. 1: status 2: update 3: revert 4: add untracked
  305. 5: patch 6: diff 7: quit 8: help
  306. What now> 7
  307. Bye.
  308.  
  309. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  310. $ git commit -m "Upgrade liquibase to 3.5.x version"
  311. [TRUNK-4986 d3aca233d] Upgrade liquibase to 3.5.x version
  312. 1 file changed, 1 insertion(+), 1 deletion(-)
  313.  
  314. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  315. $ git commit -m "Upgrade liquibase to 3.5.x version TRUNK-4986"
  316. On branch TRUNK-4986
  317. nothing to commit, working tree clean
  318.  
  319. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  320. $ git commit --ammend -m "Upgrade liquibase to 3.5.x version TRUNK-4986"
  321. error: unknown option `ammend'
  322. usage: git commit [<options>] [--] <pathspec>...
  323.  
  324. -q, --quiet suppress summary after successful commit
  325. -v, --verbose show diff in commit message template
  326.  
  327. Commit message options
  328. -F, --file <file> read message from file
  329. --author <author> override author for commit
  330. --date <date> override date for commit
  331. -m, --message <message>
  332. commit message
  333. -c, --reedit-message <commit>
  334. reuse and edit message from specified commit
  335. -C, --reuse-message <commit>
  336. reuse message from specified commit
  337. --fixup <commit> use autosquash formatted message to fixup specified commit
  338. --squash <commit> use autosquash formatted message to squash specified commit
  339. --reset-author the commit is authored by me now (used with -C/-c/--amend)
  340. -s, --signoff add Signed-off-by:
  341. -t, --template <file>
  342. use specified template file
  343. -e, --edit force edit of commit
  344. --cleanup <default> how to strip spaces and #comments from message
  345. --status include status in commit message template
  346. -S, --gpg-sign[=<key-id>]
  347. GPG sign commit
  348.  
  349. Commit contents options
  350. -a, --all commit all changed files
  351. -i, --include add specified files to index for commit
  352. --interactive interactively add files
  353. -p, --patch interactively add changes
  354. -o, --only commit only specified files
  355. -n, --no-verify bypass pre-commit and commit-msg hooks
  356. --dry-run show what would be committed
  357. --short show status concisely
  358. --branch show branch information
  359. --ahead-behind compute full ahead/behind values
  360. --porcelain machine-readable output
  361. --long show status in long format (default)
  362. -z, --null terminate entries with NUL
  363. --amend amend previous commit
  364. --no-post-rewrite bypass post-rewrite hook
  365. -u, --untracked-files[=<mode>]
  366. show untracked files, optional modes: all, normal, no. (Default: all)
  367.  
  368.  
  369. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  370. $ git commit --amend -m "Upgrade liquibase to 3.5.x version TRUNK-4986"
  371. [TRUNK-4986 51997ec1e] Upgrade liquibase to 3.5.x version TRUNK-4986
  372. Date: Sun Jun 30 11:56:37 2019 +0300
  373. 1 file changed, 1 insertion(+), 1 deletion(-)
  374.  
  375. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  376. $ git push origin TRUNK-4986
  377. Enumerating objects: 5, done.
  378. Counting objects: 100% (5/5), done.
  379. Delta compression using up to 4 threads
  380. Compressing objects: 100% (3/3), done.
  381. Writing objects: 100% (3/3), 353 bytes | 353.00 KiB/s, done.
  382. Total 3 (delta 2), reused 0 (delta 0)
  383. remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
  384. remote:
  385. remote: Create a pull request for 'TRUNK-4986' on GitHub by visiting:
  386. remote: https://github.com/georgejunior/openmrs-core/pull/new/TRUNK-4986
  387. remote:
  388. To https://github.com/georgejunior/openmrs-core.git
  389. * [new branch] TRUNK-4986 -> TRUNK-4986
  390.  
  391. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  392. $ git status
  393. On branch TRUNK-4986
  394. nothing to commit, working tree clean
  395.  
  396. Geo jr@Geo MINGW64 ~/openmrs-core (TRUNK-4986)
  397. $ git checkout master
  398. Switched to branch 'master'
  399. Your branch is up to date with 'origin/master'.
  400.  
  401. Geo jr@Geo MINGW64 ~/openmrs-core (master)
  402. $ git pull --rebase upstream master
  403. fatal: 'upstream' does not appear to be a git repository
  404. fatal: Could not read from remote repository.
  405.  
  406. Please make sure you have the correct access rights
  407. and the repository exists.
  408.  
  409. Geo jr@Geo MINGW64 ~/openmrs-core (master)
  410. $
Advertisement
Add Comment
Please, Sign In to add comment