Guest User

git problem

a guest
Aug 31st, 2020
41
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  2. $ git reset HEAD^ --soft
  3.  
  4. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  5. $ git status
  6. On branch master
  7. Your branch is ahead of 'origin/master' by 109 commits.
  8.   (use "git push" to publish your local commits)
  9.  
  10. Changes to be committed:
  11.   (use "git restore --staged <file>..." to unstage)
  12.         modified:   api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
  13.         modified:   api/src/main/java/org/openmrs/module/ModuleFileParser.java
  14.         modified:   api/src/main/java/org/openmrs/module/SqlDiffFileParser.java
  15.         modified:   web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
  16.         modified:   web/src/main/java/org/openmrs/web/Listener.java
  17.  
  18.  
  19. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  20. $ git reset HEAD^ --hard
  21. HEAD is now at 4f20df8d78 maven(deps): bump hibernateVersion from 5.4.20.Final to 5.4.21.Final (#3544)
  22.  
  23. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  24. $ git status
  25. On branch master
  26. Your branch is ahead of 'origin/master' by 108 commits.
  27.   (use "git push" to publish your local commits)
  28.  
  29. nothing to commit, working tree clean
  30.  
  31. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  32. $ $ git reset HEAD^ --hard
  33. bash: $: command not found
  34.  
  35. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  36. $ git reset --hard origin/master
  37. HEAD is now at cc00b32b1e Making test modules run on platform 2.x
  38.  
  39. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  40. $ git status
  41. On branch master
  42. Your branch is up to date with 'origin/master'.
  43.  
  44. nothing to commit, working tree clean
  45.  
  46. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  47. $ git pull --rebase upstream master
  48. From https://github.com/openmrs/openmrs-core
  49.  * branch                  master     -> FETCH_HEAD
  50. Updating cc00b32b1e..aed41971cc
  51. Fast-forward
  52.  .github/dependabot.yml                             |    59 +
  53.  .gitignore                                         |     3 +
  54.  api/pom.xml                                        |    41 +-
  55.  .../ext/datatype/core/PostgreSQLBlobType.java      |    50 +
  56.  api/src/main/java/org/openmrs/FormResource.java    |     1 -
  57.  api/src/main/java/org/openmrs/GlobalProperty.java  |     1 -
  58.  api/src/main/java/org/openmrs/Patient.java         |     8 -
  59.  .../org/openmrs/api/AdministrationService.java     |    12 +
  60.  .../main/java/org/openmrs/api/OrderSetService.java |    36 +-
  61.  .../main/java/org/openmrs/api/context/Context.java |     2 +-
  62.  .../org/openmrs/api/context/ServiceContext.java    |    10 +-
  63.  .../UsernamePasswordAuthenticationScheme.java      |    30 +-
  64.  .../java/org/openmrs/api/db/AdministrationDAO.java |     5 +
  65.  .../openmrs/api/db/DelegatingFullTextSession.java  |     8 +-
  66.  .../api/db/hibernate/AuditableInterceptor.java     |     8 +-
  67.  .../db/hibernate/HibernateAdministrationDAO.java   |    52 +
  68.  .../api/db/hibernate/HibernateContextDAO.java      |   101 +-
  69.  .../api/db/hibernate/HibernateEncounterDAO.java    |    12 +-
  70.  .../api/db/hibernate/HibernateOrderDAO.java        |     6 +-
  71.  .../api/db/hibernate/HibernatePersonDAO.java       |    13 +-
  72.  .../db/hibernate/HibernateSerializedObjectDAO.java |     2 +-
  73.  .../openmrs/api/db/hibernate/HibernateUserDAO.java |     8 +-
  74.  .../openmrs/api/db/hibernate/HibernateUtil.java    |    21 +
  75.  .../NativeIfNotAssignedIdentityGenerator.java      |     1 -
  76.  .../api/db/hibernate/PersonLuceneQuery.java        |     2 +-
  77.  .../api/db/hibernate/search/LuceneQuery.java       |     3 +-
  78.  .../api/impl/AdministrationServiceImpl.java        |     9 +
  79.  .../org/openmrs/api/impl/EncounterServiceImpl.java |     5 +-
  80.  .../org/openmrs/api/impl/OrderServiceImpl.java     |     2 +-
  81.  .../java/org/openmrs/api/impl/UserServiceImpl.java |    12 +-
  82.  .../org/openmrs/liquibase/ChangeLogDetective.java  |     2 +-
  83.  .../org/openmrs/liquibase/LiquibaseProvider.java   |     2 +-
  84.  api/src/main/java/org/openmrs/module/Module.java   |     2 +-
  85.  .../java/org/openmrs/module/ModuleClassLoader.java |     8 +-
  86.  .../java/org/openmrs/module/ModuleFileParser.java  |    13 +-
  87.  .../java/org/openmrs/module/SqlDiffFileParser.java |     9 +-
  88.  .../java/org/openmrs/util/DatabaseUpdater.java     |     2 +-
  89.  .../main/java/org/openmrs/util/HandlerUtil.java    |     3 +-
  90.  .../main/java/org/openmrs/util/OpenmrsUtil.java    |    10 +-
  91.  api/src/main/java/org/openmrs/util/Security.java   |   147 +-
  92.  .../openmrs/util/ThreadSafeCircularFifoQueue.java  |     4 +-
  93.  .../openmrs/api/db/hibernate/OrderGroup.hbm.xml    |     2 -
  94.  .../updates/liquibase-update-to-latest-2.4.x.xml   |    24 -
  95.  .../java/org/openmrs/api/OrderServiceTest.java     |    53 +
  96.  .../java/org/openmrs/api/OrderSetServiceTest.java  |   126 +
  97.  .../include/HibernateAlertDAOTestDataSet.xml       |     2 +-
  98.  .../api/include/OrderSetServiceTest-attributes.xml |    19 +
  99.  .../openmrs/module/include/test1-2.0-SNAPSHOT.omod |   Bin 20862 -> 20150 bytes
  100.  .../openmrs/module/include/test3-2.0-SNAPSHOT.omod |   Bin 20265 -> 20287 bytes
  101.  liquibase/README.md                                |   287 +-
  102.  liquibase/pom.xml                                  |    67 +-
  103.  liquibase/scripts/create_liquibase_snapshots.sh    |    68 +
  104.  liquibase/scripts/fix_liquibase_snapshots.sh       |    22 +
  105.  liquibase/scripts/test_liquibase_snapshots.sh      |    55 +
  106.  liquibase/snapshots/README.md                      |     1 +
  107.  .../openmrs/liquibase/AbstractSnapshotTuner.java   |   248 +
  108.  .../java/org/openmrs/liquibase/CoreDataTuner.java  |   169 +
  109.  .../src/main/java/org/openmrs/liquibase/Main.java  |    54 +
  110.  .../org/openmrs/liquibase/SchemaOnlyTuner.java     |   102 +
  111.  liquibase/src/main/resources/log4j2.xml            |    26 +
  112.  .../liquibase/AbstractSnapshotTunerTest.java       |   104 +
  113.  .../org/openmrs/liquibase/CoreDataTunerTest.java   |   223 +
  114.  .../test/java/org/openmrs/liquibase/MainTest.java  |    38 +
  115.  .../org/openmrs/liquibase/SchemaOnlyTunerTest.java |   179 +
  116.  .../src/test/resources/file-with-license-header.md |    12 +
  117.  .../test/resources/file-without-license-header.md  |     1 +
  118.  liquibase/src/test/resources/log4j2.xml            |    26 +
  119.  .../core-data/liquibase-core-data-SNAPSHOT.xml     | 19748 +++++++++++++++++++
  120.  .../liquibase-core-data-UPDATED-SNAPSHOT.xml       |  5242 +++++
  121.  .../schema-only/liquibase-schema-only-SNAPSHOT.xml |  6271 ++++++
  122.  .../liquibase-schema-only-UPDATED-SNAPSHOT.xml     |  6229 ++++++
  123.  pom.xml                                            |   120 +-
  124.  test/pom.xml                                       |    16 +
  125.  web/pom.xml                                        |    51 +-
  126.  .../java/org/openmrs/module/web/WebModuleUtil.java |    10 +-
  127.  web/src/main/java/org/openmrs/web/Listener.java    |    10 +-
  128.  .../java/org/openmrs/web/filter/GZIPFilter.java    |     8 +-
  129.  .../java/org/openmrs/web/filter/OpenmrsFilter.java |    12 +-
  130.  .../initialization/InitializationFilter.java       |    11 +
  131.  .../web/filter/update/DatabaseUpdaterWrapper.java  |    28 +
  132.  .../openmrs/web/filter/update/UpdateFilter.java    |     1 -
  133.  .../web/filter/update/UpdateFilterModel.java       |    16 +-
  134.  .../web/filter/update/UpdateFilterModelTest.java   |   146 +-
  135.  .../org/openmrs/web/test/TestContextLoader.java    |     2 +-
  136.  .../openmrs/web/test/WebModuleActivatorTest.java   |    30 +-
  137.  .../jupiter/BaseModuleWebContextSensitiveTest.java |    28 +
  138.  webapp/pom.xml                                     |    10 +-
  139.  87 files changed, 39968 insertions(+), 654 deletions(-)
  140.  create mode 100644 .github/dependabot.yml
  141.  create mode 100644 api/src/main/java/liquibase/ext/datatype/core/PostgreSQLBlobType.java
  142.  create mode 100644 api/src/test/resources/org/openmrs/api/include/OrderSetServiceTest-attributes.xml
  143.  create mode 100644 liquibase/scripts/create_liquibase_snapshots.sh
  144.  create mode 100644 liquibase/scripts/fix_liquibase_snapshots.sh
  145.  create mode 100644 liquibase/scripts/test_liquibase_snapshots.sh
  146.  create mode 100644 liquibase/snapshots/README.md
  147.  create mode 100644 liquibase/src/main/java/org/openmrs/liquibase/AbstractSnapshotTuner.java
  148.  create mode 100644 liquibase/src/main/java/org/openmrs/liquibase/CoreDataTuner.java
  149.  create mode 100644 liquibase/src/main/java/org/openmrs/liquibase/Main.java
  150.  create mode 100644 liquibase/src/main/java/org/openmrs/liquibase/SchemaOnlyTuner.java
  151.  create mode 100644 liquibase/src/main/resources/log4j2.xml
  152.  create mode 100644 liquibase/src/test/java/org/openmrs/liquibase/AbstractSnapshotTunerTest.java
  153.  create mode 100644 liquibase/src/test/java/org/openmrs/liquibase/CoreDataTunerTest.java
  154.  create mode 100644 liquibase/src/test/java/org/openmrs/liquibase/MainTest.java
  155.  create mode 100644 liquibase/src/test/java/org/openmrs/liquibase/SchemaOnlyTunerTest.java
  156.  create mode 100644 liquibase/src/test/resources/file-with-license-header.md
  157.  create mode 100644 liquibase/src/test/resources/file-without-license-header.md
  158.  create mode 100644 liquibase/src/test/resources/log4j2.xml
  159.  create mode 100644 liquibase/src/test/resources/org/openmrs/liquibase/snapshots/core-data/liquibase-core-data-SNAPSHOT.xml
  160.  create mode 100644 liquibase/src/test/resources/org/openmrs/liquibase/snapshots/core-data/liquibase-core-data-UPDATED-SNAPSHOT.xml
  161.  create mode 100644 liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml
  162.  create mode 100644 liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml
  163.  create mode 100644 web/src/main/java/org/openmrs/web/filter/update/DatabaseUpdaterWrapper.java
  164.  create mode 100644 web/src/test/java/org/openmrs/web/test/jupiter/BaseModuleWebContextSensitiveTest.java
  165.  
  166. Insookwa@DESKTOP-4T543HR MINGW64 ~/openmrs-core (master)
  167. $ git status
  168. On branch master
  169. Your branch is ahead of 'origin/master' by 110 commits.
  170.   (use "git push" to publish your local commits)
  171.  
  172. nothing to commit, working tree clean
  173.  
  174.  
RAW Paste Data