Inconsistent information in Git (log vs. diff) about one file

I ran into a problem running after git commands:

  • The difference between the two branches for one file provides clear information about the differences:

    $ git diff --shortstat develop-2.2 feature/develop-2.2-Grouping -- coba.zaa.tools/coba.zaa.tools.resources/src/main/resources/workflows/processflow/statemachine.ftl
    
    1 file changed, 162 insertions(+), 24 deletions(-)
    
  • However, finding commits with differences does not yield any results:

    $ git log --oneline develop-2.2...feature/develop-2.2-Grouping coba.zaa.tools/coba.zaa.tools.resources/src/main/resources/workflows/processflow/statemachine.ftl
    

Is this the right argument, and if this is my repo? Is there a way to check repo consistency (for example, if all the commits are the same, then all the files should be the same)?

+4
source share
1 answer

--full-history performed this work.

, git log , . , . @jthill .

, git log , .

0

Source: https://habr.com/ru/post/1666639/


All Articles