|
|
|
Created:
16 years, 12 months ago by nickcarter Modified:
16 years, 11 months ago CC:
evanm Visibility:
Public. |
Add the --no-ext-diff flag to git-cl and upload.py. But since
this is broken in every version of Git that I tried, override
the GIT_EXTERNAL_DIFF environment variable too, which has the
advantage of actually working.
Patch Set 1 #
Total comments: 5
Total messages: 2
|
Evan Martin
LGTM http://codereview.appspot.com/11920/diff/1/2 File git-cl (right): http://codereview.appspot.com/11920/diff/1/2#newcode371 Line 371: if 'GIT_EXTERNAL_DIFF' in env: del env['GIT_EXTERNAL_DIFF'] newline ...
|
16 years, 12 months ago (2009年01月16日 22:50:52 UTC) #1 |
LGTM http://codereview.appspot.com/11920/diff/1/2 File git-cl (right): http://codereview.appspot.com/11920/diff/1/2#newcode371 Line 371: if 'GIT_EXTERNAL_DIFF' in env: del env['GIT_EXTERNAL_DIFF'] newline after colon http://codereview.appspot.com/11920/diff/1/3 File upload.py (right): http://codereview.appspot.com/11920/diff/1/3#newcode1005 Line 1005: if 'GIT_EXTERNAL_DIFF' in env: del env['GIT_EXTERNAL_DIFF'] here too
http://codereview.appspot.com/11920/diff/1/3 File upload.py (right): http://codereview.appspot.com/11920/diff/1/3#newcode543 Line 543: env=os.environ): I think we should better use env=None here as it's the default for subprocess.Popen's env parameter too. http://codereview.appspot.com/11920/diff/1/3#newcode580 Line 580: print_output=False, env=os.environ): ditto http://codereview.appspot.com/11920/diff/1/3#newcode1003 Line 1003: # git config key "diff.external" is used). What about checking the output of "git conig --get diff.external" here and print a info/warning if an external diff tool is used?