Просмотр исходного кода

Merge pull request #28231 from overleaf/mj-git-bridge-git-upgrade

[git-bridge] Update git message version in tests

GitOrigin-RevId: b0834ac6bf1e6bdb3126dc1720c53e2968b5630e
Mathias Jakobsen 11 месяцев назад
Родитель
Сommit
ad7afc7594

+ 4 - 4
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java

@@ -750,8 +750,8 @@ public class WLGitBridgeIntegrationTest {
           + PROJECT_ID
           + "'\n"
           + "hint: Updates were rejected because the tip of your current branch is behind\n"
-          + "hint: its remote counterpart. Integrate the remote changes (e.g.\n"
-          + "hint: 'git pull ...') before pushing again.\n"
+          + "hint: its remote counterpart. If you want to integrate the remote changes,\n"
+          + "hint: use 'git pull' before pushing again.\n"
           + "hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n";
 
   @Test
@@ -779,8 +779,8 @@ public class WLGitBridgeIntegrationTest {
           + PROJECT_ID
           + "'\n"
           + "hint: Updates were rejected because the tip of your current branch is behind\n"
-          + "hint: its remote counterpart. Integrate the remote changes (e.g.\n"
-          + "hint: 'git pull ...') before pushing again.\n"
+          + "hint: its remote counterpart. If you want to integrate the remote changes,\n"
+          + "hint: use 'git pull' before pushing again.\n"
           + "hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n";
 
   @Test