OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvements to Diff of modified version against head
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseProc
/
Commands
/
DiffCommand.cpp
diff --git
a/src/TortoiseProc/Commands/DiffCommand.cpp
b/src/TortoiseProc/Commands/DiffCommand.cpp
index
090615a
..
dd081f8
100644
(file)
--- a/
src/TortoiseProc/Commands/DiffCommand.cpp
+++ b/
src/TortoiseProc/Commands/DiffCommand.cpp
@@
-29,7
+29,7
@@
bool DiffCommand::Execute()
bool bRet = false;
\r
CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));
\r
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
\r
bool bRet = false;
\r
CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));
\r
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
\r
-
bool bBlame = !!parser.HasKey(_T("blame"));
\r
+
//
bool bBlame = !!parser.HasKey(_T("blame"));
\r
if (path2.IsEmpty())
\r
{
\r
if (cmdLinePath.IsDirectory())
\r
if (path2.IsEmpty())
\r
{
\r
if (cmdLinePath.IsDirectory())
\r
@@
-54,7
+54,7
@@
bool DiffCommand::Execute()
#endif
\r
{
\r
//git_revnum_t baseRev = 0;
\r
#endif
\r
{
\r
//git_revnum_t baseRev = 0;
\r
- bRet = diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(
_T("HEAD")),git_revnum_t(GIT_REV_ZERO
));
\r
+ bRet = diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(
GIT_REV_ZERO),git_revnum_t(_T("HEAD")
));
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r