Skip to content

[merge requests] diff_by_file_hash action returns unexpected result

The diff_by_file_hash endpoint could produce a different content_sha value for a file than diffs_batch.json endpoint. Even though the file_hash are matching.

Here are the example responses:

diff_by_file_hash
{
    "content_sha": "600fb58e0bcc376a969ac0eb59fd3eb5bfc23e8e",
    "submodule": false,
    "submodule_link": null,
    "submodule_tree_url": null,
    "submodule_compare": null,
    "edit_path": "/flightjs/Flight/-/edit/mastergf/ADOPTERS.md?from_merge_request_iid=11",
    "ide_edit_path": "/-/ide/project/flightjs/Flight/merge_requests/11",
    "old_path_html": "ADOPTERS.md",
    "new_path_html": "ADOPTERS.md",
    "blob": {
        "id": "6bb6a5cb2fce7822f964eabcce2880f85720fb15",
        "path": "ADOPTERS.md",
        "name": "ADOPTERS.md",
        "mode": "100644",
        "readable_text": true,
        "icon": "doc-text"
    },
    "can_modify_blob": true,
    "file_identifier_hash": "ec1b775c87e53b723a08c25c9a3a837b01e581de",
    "file_hash": "97399758eb917684742c84505e79039b083c9164",
    "file_path": "ADOPTERS.md",
    "old_path": "ADOPTERS.md",
    "new_path": "ADOPTERS.md",
    "new_file": false,
    "renamed_file": false,
    "deleted_file": false,
    "diff_refs": {
        "base_sha": "f400b5dcbd6381f8cd3cb37ae3555facfea7e7a7",
        "start_sha": "f400b5dcbd6381f8cd3cb37ae3555facfea7e7a7",
        "head_sha": "600fb58e0bcc376a969ac0eb59fd3eb5bfc23e8e"
    },
    "stored_externally": null,
    "external_storage": null,
    "mode_changed": false,
    "a_mode": "100644",
    "b_mode": "100644",
    "viewer": {
        "name": "text",
        "error": null,
        "error_message": null,
        "collapsed": false,
        "whitespace_only": false
    },
    "alternate_viewer": null,
    "old_size": 1314,
    "new_size": 3920,
    "conflict_type": null,
    "added_lines": 54,
    "removed_lines": 0,
    "load_collapsed_diff_url": "/flightjs/Flight/-/merge_requests/11/diff_for_path?file_identifier=ADOPTERS.md-false-false-false&new_path=ADOPTERS.md&old_path=ADOPTERS.md",
    "view_path": "/flightjs/Flight/-/blob/600fb58e0bcc376a969ac0eb59fd3eb5bfc23e8e/ADOPTERS.md",
    "replaced_view_path": null,
    "context_lines_path": "/flightjs/Flight/-/blob/600fb58e0bcc376a969ac0eb59fd3eb5bfc23e8e/ADOPTERS.md/diff",
    "is_fully_expanded": false,
    "code_navigation_path": null
}
diffs_batch.json
{
    "content_sha": "dab1378bcf3b6b212a2ff35fad6e5b1ea81dae0d",
    "submodule": false,
    "submodule_link": null,
    "submodule_tree_url": null,
    "submodule_compare": null,
    "edit_path": "/flightjs/Flight/-/edit/mastergf/ADOPTERS.md?from_merge_request_iid=11",
    "ide_edit_path": "/-/ide/project/flightjs/Flight/merge_requests/11",
    "old_path_html": "ADOPTERS.md",
    "new_path_html": "ADOPTERS.md",
    "blob": {
        "id": "6bb6a5cb2fce7822f964eabcce2880f85720fb15",
        "path": "ADOPTERS.md",
        "name": "ADOPTERS.md",
        "mode": "100644",
        "readable_text": true,
        "icon": "doc-text"
    },
    "can_modify_blob": true,
    "file_identifier_hash": "ec1b775c87e53b723a08c25c9a3a837b01e581de",
    "file_hash": "97399758eb917684742c84505e79039b083c9164",
    "file_path": "ADOPTERS.md",
    "old_path": "ADOPTERS.md",
    "new_path": "ADOPTERS.md",
    "new_file": false,
    "renamed_file": false,
    "deleted_file": false,
    "diff_refs": {
        "base_sha": "f400b5dcbd6381f8cd3cb37ae3555facfea7e7a7",
        "start_sha": "f400b5dcbd6381f8cd3cb37ae3555facfea7e7a7",
        "head_sha": "dab1378bcf3b6b212a2ff35fad6e5b1ea81dae0d"
    },
    "stored_externally": null,
    "external_storage": null,
    "mode_changed": false,
    "a_mode": "100644",
    "b_mode": "100644",
    "viewer": {
        "name": "text",
        "error": null,
        "error_message": null,
        "collapsed": null,
        "whitespace_only": false
    },
    "alternate_viewer": null,
    "old_size": 1314,
    "new_size": 3920,
    "conflict_type": null,
    "added_lines": 54,
    "removed_lines": 0,
    "load_collapsed_diff_url": "/flightjs/Flight/-/merge_requests/11/diff_for_path?file_identifier=ADOPTERS.md-false-false-false&new_path=ADOPTERS.md&old_path=ADOPTERS.md",
    "view_path": "/flightjs/Flight/-/blob/dab1378bcf3b6b212a2ff35fad6e5b1ea81dae0d/ADOPTERS.md",
    "replaced_view_path": null,
    "context_lines_path": "/flightjs/Flight/-/blob/dab1378bcf3b6b212a2ff35fad6e5b1ea81dae0d/ADOPTERS.md/diff",
    "is_fully_expanded": false,
    "code_navigation_path": null
}