diff --git a/package.json b/package.json index 97531acfb..8811523c1 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ ] }, "devDependencies": { - "@abaplint/cli": "^2.113.21", + "@abaplint/cli": "^2.113.31", "@abaplint/database-sqlite": "^2.10.20", "@abaplint/runtime": "^2.10.20", "express": "^4.21.1", @@ -31,6 +31,6 @@ "globals": "^15.11.0", "abapmerge": "^0.16.6", "c8": "^10.1.2", - "eslint": "^9.12.0" + "eslint": "^9.13.0" } } diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap index cdea8850f..a8799b0e3 100644 --- a/src/git/zcl_abapgit_git_pack.clas.abap +++ b/src/git/zcl_abapgit_git_pack.clas.abap @@ -178,14 +178,18 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. lv_data = iv_data. * header - IF NOT xstrlen( lv_data ) > 4 OR lv_data(4) <> c_pack_start. - zcx_abapgit_exception=>raise( |Unexpected pack header| ). + IF xstrlen( lv_data ) < 4. + zcx_abapgit_exception=>raise( |Unexpected pack header, short reply| ). + ENDIF. + + IF lv_data(4) <> c_pack_start. + zcx_abapgit_exception=>raise( |Unexpected pack header, { lv_data(4) }| ). ENDIF. lv_data = lv_data+4. * version IF lv_data(4) <> c_version. - zcx_abapgit_exception=>raise( |Version not supported| ). + zcx_abapgit_exception=>raise( |Version not supported, { lv_data(4) }| ). ENDIF. lv_data = lv_data+4. diff --git a/test/src/zcl_abapgit_integration_gitv2.clas.testclasses.abap b/test/src/zcl_abapgit_integration_gitv2.clas.testclasses.abap index 4f182595f..b8844d0ae 100644 --- a/test/src/zcl_abapgit_integration_gitv2.clas.testclasses.abap +++ b/test/src/zcl_abapgit_integration_gitv2.clas.testclasses.abap @@ -48,7 +48,8 @@ CLASS ltcl_test IMPLEMENTATION. DATA lt_objects TYPE zif_abapgit_definitions=>ty_objects_tt. DATA lt_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1_tt. - INSERT '7bdd8f9f4c6bb0ece461b78c7b559957fad6c3ae' INTO TABLE lt_sha1. +* todo, given the sha1, this test might fail after a year? + INSERT 'e83a31ebafde4e8e7e80ca36662e42e8f20895c5' INTO TABLE lt_sha1. lt_objects = zcl_abapgit_git_factory=>get_v2_porcelain( )->commits_last_year( iv_url = 'https://github.com/abapGit/abapGit.git'