SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 04:08:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1063 from larshp/issue_1039

Browse Source 
bugfix, identical trees, #1039
This commit is contained in:
Lars Hvam 2017-11-26 13:47:47 +01:00 committed by GitHub
commit 3e99c681dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zabapgit_git.prog.abap
View File

@ -252,7 +252,7 @@ CLASS lcl_git_transport IMPLEMENTATION.
lcl_git_utils=>get_null( ) && lcl_git_utils=>get_null( ) &&
` ` && ` ` &&
lv_cap_list && lv_cap_list &&
zif_abapgit_definitions=>gc_newline. "#EC NOTEXT zif_abapgit_definitions=>gc_newline. "#EC NOTEXT
lv_cmd_pkt = lcl_git_utils=>pkt_string( lv_line ). lv_cmd_pkt = lcl_git_utils=>pkt_string( lv_line ).
lv_buffer = lv_cmd_pkt && '0000'. lv_buffer = lv_cmd_pkt && '0000'.
@ -348,17 +348,17 @@ CLASS lcl_git_transport IMPLEMENTATION.
lv_capa = 'side-band-64k no-progress multi_ack agent=' lv_capa = 'side-band-64k no-progress multi_ack agent='
&& lcl_http=>get_agent( ) ##NO_TEXT. && lcl_http=>get_agent( ) ##NO_TEXT.
lv_line = 'want' && ` ` && <ls_branch>-sha1 lv_line = 'want' && ` ` && <ls_branch>-sha1
&& ` ` && lv_capa && zif_abapgit_definitions=>gc_newline. "#EC NOTEXT && ` ` && lv_capa && zif_abapgit_definitions=>gc_newline. "#EC NOTEXT
ELSE. ELSE.
lv_line = 'want' && ` ` && <ls_branch>-sha1 lv_line = 'want' && ` ` && <ls_branch>-sha1
&& zif_abapgit_definitions=>gc_newline. "#EC NOTEXT && zif_abapgit_definitions=>gc_newline. "#EC NOTEXT
ENDIF. ENDIF.
lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( lv_line ). lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( lv_line ).
ENDLOOP. ENDLOOP.
IF iv_deepen = abap_true. IF iv_deepen = abap_true.
lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( 'deepen 1' lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( 'deepen 1'
&& zif_abapgit_definitions=>gc_newline ). "#EC NOTEXT && zif_abapgit_definitions=>gc_newline ). "#EC NOTEXT
ENDIF. ENDIF.
lv_buffer = lv_buffer lv_buffer = lv_buffer
@ -1240,6 +1240,14 @@ CLASS lcl_git_porcelain IMPLEMENTATION.
LOOP AT it_trees ASSIGNING <ls_tree>. LOOP AT it_trees ASSIGNING <ls_tree>.
CLEAR ls_object. CLEAR ls_object.
ls_object-sha1 = <ls_tree>-sha1. ls_object-sha1 = <ls_tree>-sha1.
READ TABLE lt_objects WITH KEY type = zif_abapgit_definitions=>gc_type-tree sha1 = ls_object-sha1
TRANSPORTING NO FIELDS.
IF sy-subrc = 0.
* two identical trees added at the same time, only add one to the pack
CONTINUE.
ENDIF.
ls_object-type = zif_abapgit_definitions=>gc_type-tree. ls_object-type = zif_abapgit_definitions=>gc_type-tree.
ls_object-data = <ls_tree>-data. ls_object-data = <ls_tree>-data.
APPEND ls_object TO lt_objects. APPEND ls_object TO lt_objects.