Skip to content
This repository has been archived by the owner on Oct 27, 2019. It is now read-only.

Commit

Permalink
Fixed fetch
Browse files Browse the repository at this point in the history
  • Loading branch information
@subtleGradient
subtleGradient committed Aug 25, 2008
1 parent 0dcb444 commit c022ccf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Support/git.gui.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ def fetch
message "Fetching from Origin…"
j `cd "#{PROJECT_PATH}"; git fetch origin`
message "Diffing from Origin…"
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..origin/#{branch?} > .fetch_origin_#{branch?}.diff ;mate -a .fetch_origin_#{branch?}.diff ;rm .fetch_origin_#{branch?}.diff`
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..origin/master > .fetch_origin_#{branch?}_master.diff ;mate -a .fetch_origin_#{branch?}_master.diff ;rm .fetch_origin_#{branch?}_master.diff` unless branch? == 'master'
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..origin/#{branch?} > /tmp/.fetch_origin_#{branch?}.diff ;mate -a /tmp/.fetch_origin_#{branch?}.diff`
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..origin/master > /tmp/.fetch_origin_#{branch?}_master.diff ;mate -a /tmp/.fetch_origin_#{branch?}_master.diff` unless branch? == 'master'

message "Fetching from Stage…"
j `cd "#{PROJECT_PATH}"; git fetch stage`
message "Diffing from Stage…"
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..stage/#{branch?} > .fetch_stage_#{branch?}.diff ;mate -a .fetch_stage_#{branch?}.diff ;rm .fetch_stage_#{branch?}.diff`
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..stage/master > .fetch_stage_#{branch?}_master.diff ;mate -a .fetch_stage_#{branch?}_master.diff ;rm .fetch_stage_#{branch?}_master.diff` unless branch? == 'master'
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..stage/#{branch?} > /tmp/.fetch_stage_#{branch?}.diff ;mate -a /tmp/.fetch_stage_#{branch?}.diff`
`cd "#{PROJECT_PATH}"; git log -p #{branch?}..stage/master > /tmp/.fetch_stage_#{branch?}_master.diff ;mate -a /tmp/.fetch_stage_#{branch?}_master.diff` unless branch? == 'master'

diffs = []
diffs << ".fetch_origin_#{branch?}.diff"
Expand Down

0 comments on commit c022ccf

Please sign in to comment.