SOURCE - Doubsts about DIFF commnad

Hi

I have executed DIFF command with GIT syntax and using SOURCETREE, and i have noticed differences between then.

 

I tried to verify differences between "MASTER" and "FEATURE/VAFEI-40055-NOVOPP", to identify which files are changed in the last.

 

A) GIT: 

git remote show https://xpto:password@git.xpto.pts/git/VAFEI/vivoxis-database.git
git -c diff.mnemonicprefix=false -c core.quotepath=false checkout feature/VAFEI-40055-NovoPP
git diff --name-only master...feature/VAFEI-40055-NovoPP

These command returned about 475 filenames (i know that there are few files changed).

 

B) SOURCEFREE:

 

SOURCETREE.jpg

I have select "MASTER", then posicioned the mouse on "FEATURE/VAFEI-40055-NOVOPP" and then runned option DIFFs AGAINST CURRENT, so i´ve detected 42 files changed.

 

What´s wrong with option "A" ?  Did i miss something in the GIT command? Why dit it returned so many files?

 

Best reggards,

Sergio

 

2 answers

Maybe you have the SourceTree diff panel set to ignore whitespace.

Hi,

 

I have checked SOURCETREE options for DIFF command:

 

SOURCETREE_GIF_DIFF_CONFIGURATION.jpgSo i tried a diferent syntax to execute GIT DIFF, unfortunatelly with the same results. GIT DIFF command is reporting much more differences than SOURCETREE (that i know it´s right).

git diff --name-only --ignore-space-at-eol -b -w --ignore-blank-lines  master...feature/VAFEI-40055-NovoPP

What am i m missing in this command? Why there are diferences and how could i fix it?

I am trying to develop a REPORT GIT using MS-DOS to report which scripts of any feature that are different compared with MASTER. Do you think it´s possible to do it?

 

Best reggards and have a nice 2017 !!!

 

Sergio

Sorry,

This is the first time i use ATLASSIAN site. My feedback is reported like a new asnwer.

 

Reggards,

 

Sergio

Hi,

 

Very strange. I have repeated the same command suppressing one point (.) in command DIFF and now have the same result of of SOURCETREE (with an error message in beginning:

 

BEFORE (three points - output is wrong):

git diff --name-only --ignore-space-at-eol -b -w --ignore-blank-lines feature/VAFEI-40055-NovoPP...master

AFTER (two points - output is right, the same of SOURCETREE):

git diff --name-only --ignore-space-at-eol -b -w --ignore-blank-lines feature/VAFEI-40055-NovoPP..master


error: cannot spawn less: No such file or directory


Procedures/CONVERGENTE_OW_PRC_PRC_ORQUESTRARPESSOA.sql
Procedures/CONVERGENTE_OW_PRC_PRC_ORQUESTRARPRODUTO.sql
Procedures/LOAD_PRC_TRUNCEXCLPROGRELACIONAMENTO.SQL
Procedures/SOA_OW_PRC_PRC_BUSCARPROGRELACIONAMENTO.SQL
Procedures/SOA_OW_PRC_PRC_MANTERPROGRELACIONAMENTO.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERCLIENTE.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERCLIENTESINCRONISMO.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERCLIENTESISTEMAORIGEM.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERDOCSINCRONISMO.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERLINHADOC.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERLINHAPRESINCRONISMO.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERLINHASCLIENTE.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERPLANOSINCRONISMO.SQL
Procedures/VIVOVALORIZA_PRC_PRC_MANTERPRHISTORICO.SQL
Scripts/Atividade/A_LOAD_C00_EXCLUSAOPROGRAMARELACIONAMENTO.SQL
Scripts/Atividade/A_VIVOVALORIZA_A00_CLIENTEVV.sql
Scripts/Atividade/A_VIVOVALORIZA_A00_LINHAVV.sql
Scripts/Atividade/A_VIVOVALORIZA_C00_PARAMPROGRELACIONAMENTO.sql
Scripts/Atividade/A_VIVOVALORIZA_G00.sql
Scripts/Atividade/A_VIVOVALORIZA_M00_CLIENTEVV.sql
Scripts/Rollback/R_CONVERGENTE_OW_PRC_PRC_ORQUESTRARPESSOA.sql
Scripts/Rollback/R_CONVERGENTE_OW_PRC_PRC_ORQUESTRARPRODUTO.sql
Scripts/Rollback/R_LOAD_C00_EXCLUSAOPROGRAMARELACIONAMENTO.SQL
Scripts/Rollback/R_LOAD_PRC_TRUNCEXCLPROGRELACIONAMENTO.SQL
Scripts/Rollback/R_SOA_OW_PRC_PRC_BUSCARPROGRELACIONAMENTO.SQL
Scripts/Rollback/R_SOA_OW_PRC_PRC_MANTERPROGRELACIONAMENTO.SQL
Scripts/Rollback/R_VIVOVALORIZA_A00_CLIENTEVV.sql
Scripts/Rollback/R_VIVOVALORIZA_A00_LINHAVV.sql
Scripts/Rollback/R_VIVOVALORIZA_C00_PARAMPROGRELACIONAMENTO.sql
Scripts/Rollback/R_VIVOVALORIZA_G00.sql
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERCLIENTE.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERCLIENTESINCRONISMO.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERCLIENTESISTEMAORIGEM.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERDOCSINCRONISMO.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERLINHADOC.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERLINHAPRESINCRONISMO.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERLINHASCLIENTE.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERPLANOSINCRONISMO.SQL
Scripts/Rollback/R_VIVOVALORIZA_PRC_PRC_MANTERPRHISTORICO.SQL
Scripts/Rollback/R_VIVOVALORIZA_SEQ_PARAMPROGRELACIONAMENTOSQ.SQL
Sequences/VIVOVALORIZA_SEQ_PARAMPROGRELACIONAMENTOSQ.SQL
Views/CUSTOMER_VW_VIVOVALORIZA.SQL

 

Why it´s correct now? supressing one "."  of  string "..." in DIFF command?

 

Reggards,

 

Sergio

Yes, the difference between two dots and three dots, which are both valid syntax, but have different meanings: https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges

The error message was that git tried to use the "less" utility to display the output of the diff. It couldn't find that, so it just dumped the output directly instead, which is fine in this case.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

825 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you