Project

General

Profile

[SOLVED] diff commands do not respond

Added by Frank Church about 7 years ago

I am having a problem in my Redmine installations where the diff command doesn't return. When I check the log this is what I see. It doesn't return at all.

How can I see what is happening further down the line and find out whether something is being returned at all?

Started GET "/redmine/projects/house-install-scripts/repository/diff?utf8=%E2%9C%93&rev=aeeaee0c27230e055
ef6e7eea8451ea3141981bd&rev_to=5dbac68854eb4abd8d3ba1e8f17b7d1362170f47" for x.x.x.x at 2017-09-27
 07:00:07 +0100                                                                                          
Processing by RepositoriesController#diff as HTML                                                        
  Parameters: {"utf8"=>"✓", "rev"=>"aeeaee0c27230e055ef6e7eea8451ea3141981bd", "rev_to"=>"5dbac68854eb4ab
d8d3ba1e8f17b7d1362170f47", "id"=>"house-install-scripts"}                                               
  Current user: admin@1.rca2.net (id=1)                                                                  
Read fragment views/repositories/diff/3/f49ea8f96f64cf68926d0bd140d97817 (0.2ms)                        

Replies (1)

RE: [SOLVED] diff commands do not respond - Added by Frank Church about 7 years ago

I tracked it down to an override in my environment variables where I overrode the program used by `git diff`.

  1. environment variables
    GIT_EXTERNAL_DIFF=$HOME/bin/ssdiff.sh
    export GIT_EXTERNAL_DIFF

After commenting those lines out it works okay.

Which leads me to knowing how to override enviroment settings in a rails application.

https://stackoverflow.com/questions/46442963/how-can-i-override-the-settings-rails-inherits-from-my-environment

    (1-1/1)