git diff tmp file invalid on windows when using external program on Windows 7 -


i'm following docs git configuration page , trying apply windows 7 environment. when run say, "git diff file0" error in p4merge:

errors: '/tmp/ch9ccm_file0' (or points to) invalid file.

this true statement. not have directory called "/tmp". i've checked in c:\tmp, c:\cygwin\tmp, , %programfiles%\git\tmp.

any ideas on how change directory have?

edit:

additional info. ultimately, i'm trying winmerge (or external program) work. chose use p4merge earlier, because couldn't winmerge work, decided go program used in aforementioned article.

below relevant part of .gitconfig:

[merge] tool = extmerge [mergetool "extmerge"] cmd = extmerge \"$base\" \"$local\" \"$remote\" \"$merged\" trustexitcode = false [diff] external = extdiff

extdiff script:

#!/usr/bin/sh # extdiff # wrapper using external diff tool in git echo "file 1: $2" echo "file 2: $5" /usr/local/bin/extmerge "$2" "$5"

extmerge script:

#!/usr/bin/sh echo $* /c/program\ files\ \(x86\)/winmerge/winmergeu.exe $*

so if change file called index.html, , run git diff, result:

file 1: /tmp/xfgpoc_index.html file 2: index.html

i assume you're using cygwin... think problem cygwin, /tmp exists, windows, doesn't (it's somewhere else). me, cygwin's /tmp located in $home/appdata/cygwin/tmp , that's file was. might different depending on how installed cygwin. once find cygwin's /tmp, it's matter of finding environment variable (or creating new one, if need) windows path temp file. worked me:

[diff]    tool = p4mergetool [difftool "p4mergetool"]    cmd = p4merge.exe $homepath/appdata/cygwin$local $remote

i used homepath instead of home, because (it appears) homepath windows home environment variable (\users\myusername), while home cygwin home environment variable (/cygdrive/c/users/myusername). cygwin, type printenv see environment variables might fit.


Comments

Post a Comment

Popular posts from this blog

jquery - How can I dynamically add a browser tab? -

since using iframes house external pages are, accounts "not preferred method" , disallowed sites (flickr, one), want dynamically generate browser tabs. e.g., when user submits form, want dynamically generate tab on browser in response submitted. e.g., might want add new tab url like: http://www.bigsurgarrapata.com/contact how in jquery? you want form target attribute action attribute. http://www.w3schools.com/tags/att_form_target.asp browsers have ultimate control on result of target attribute open new tab value of _blank. <form action="contact_submit.php" target="_blank" method="post">
Read more

keyboard - C++ GetAsyncKeyState alternative -

i using windows.h library's getasynckeystate function define key pushed on keyboard . here program returns int value of pushed key example. #include <iostream> #include <windows.h> using namespace std; int main (){ char i; for(i=8;i<190;i++){ if(getasynckeystate(i)== -32767){ cout<<int (i)<<endl; } } return 0; } but trying make opengl simple game , function appeared slow . there function not need cycle 180 times , if statement . thanks you're trying make opengl game, you're going use glfw. if that's case can away using glfwgetkey() such: if (glfwgetkey(glfw_key_up) == glfw_press) {...} if (glfwgetkey(glfw_key_down) == glfw_press) {...} that method nicely explained in tutorial 6 opengl-tutorial.org . should start first tutorial of beginners tutorials , later intermediate tutorials . if you're going make win32 window can listen wm_keydown or wm_keyup messages , virtua...
Read more

android - java.net.UnknownHostException(Unable to resolve host “URL”: No address associated with hostname) -

i developing app testing asp.net webservice in android.for simple webservice adding 2 numbers used.where numbers passed parameters.the result in dialogue.the webserver works in local. when application runs following result exception.i provided internet permission in manifest. java.net.unknownhostexception(unable resolve host “ http://url.com/ ”: no address associated hostname) my code given below main activity public static string rslt=""; /** called when activity first created. */ @override public void oncreate(bundle savedinstancestate) { super.oncreate(savedinstancestate); setcontentview(r.layout.activity_main); button b1=(button)findviewbyid(r.id.button1); final alertdialog ad=new alertdialog.builder(this).create(); b1.setonclicklistener(new onclicklistener() { @override public void onclick(view arg0) { // todo auto-generated method stub try { ...
Read more