TortoiseGit merge requestshttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests2017-09-26T02:36:15Zhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/85Fixed issue #30752017-09-26T02:36:15Zusername-removed-94717Fixed issue #3075username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/82Fix the text width doesn't adjust properly2017-07-17T08:37:40Zusername-removed-94717Fix the text width doesn't adjust properlyMoving related code behind all SetWindowText()
Fix this:
![image](/uploads/4544f730de10e0fe3fc55a976b2220b1/image.png)
To this:
![image](/uploads/30872bfd3e053ebf6dbb4d73f95975a4/image.png)Moving related code behind all SetWindowText()
Fix this:
![image](/uploads/4544f730de10e0fe3fc55a976b2220b1/image.png)
To this:
![image](/uploads/30872bfd3e053ebf6dbb4d73f95975a4/image.png)username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/79Fixed issue #3011: clone: --bare and --origin options are incompatible2017-06-27T23:11:10Zusername-removed-94717Fixed issue #3011: clone: --bare and --origin options are incompatiblecf.
1. https://github.com/git/git/commit/4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7
1. https://stackoverflow.com/questions/19434441/why-are-git-clone-bare-and-origin-incompatible
1. https://git-scm.com/docs/git-clonecf.
1. https://github.com/git/git/commit/4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7
1. https://stackoverflow.com/questions/19434441/why-are-git-clone-bare-and-origin-incompatible
1. https://git-scm.com/docs/git-cloneusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/78Fix wrong path of afxres.h by using $(VCToolsInstallDir)2017-06-19T01:05:38Zusername-removed-94717Fix wrong path of afxres.h by using $(VCToolsInstallDir)Languages/TortoisePot.vcxproj uses `$(VCInstallDir)atlmfc\include\afxres.h`, but it can't locate the afxres.h of VS2017 Community any more. Because:
```
$(VCInstallDir)atlmfc\include\afxres.h
=
C:\Program Files (x86)\Microsoft Visual...Languages/TortoisePot.vcxproj uses `$(VCInstallDir)atlmfc\include\afxres.h`, but it can't locate the afxres.h of VS2017 Community any more. Because:
```
$(VCInstallDir)atlmfc\include\afxres.h
=
C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\atlmfc\include\afxres.h
```
but correct place is
```
C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\atlmfc\include\afxres.h
```
`$(VC_ATLMFC_IncludePath)` was my way to fix it, but after the testing:
```
$(VC_ATLMFC_IncludePath)\afxres.h
=
C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\atlmfc\include;\afxres.h
```
**Extra semicolon** is appended to `$(VC_ATLMFC_IncludePath)`, and make the path wrong way.
The next testing is using `$(VCToolsInstallDir)`, and it works. :-)https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/77Fixed issue #30022017-06-17T06:49:47Zusername-removed-94717Fixed issue #3002Reuse **IDS_MENUPUSH** `Pus&h...`
and delete **IDS_LOG_PUSH** `Push...`Reuse **IDS_MENUPUSH** `Pus&h...`
and delete **IDS_LOG_PUSH** `Push...`https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/71Merge unrelated2016-10-15T22:23:43Zusername-removed-138980Merge unrelatedgit 2.9 requires `--merge-unrelated-history` option if 2 commits have no common base.
This MR helps user to pass this flag to finish merging / pulling.git 2.9 requires `--merge-unrelated-history` option if 2 commits have no common base.
This MR helps user to pass this flag to finish merging / pulling.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/70Fixed issue #2845: Sticky button when resizing the "Rename dialog"2016-10-10T13:20:42Zusername-removed-94717Fixed issue #2845: Sticky button when resizing the "Rename dialog"Tested:
![image](/uploads/b2e27cfb541684e57f5d93fc436b74c0/image.png)Tested:
![image](/uploads/b2e27cfb541684e57f5d93fc436b74c0/image.png)username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/67Update README2016-07-24T14:23:25Zusername-removed-632909Update READMEGrammar edits to READMEGrammar edits to READMEhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/65Kill thread2016-06-29T18:41:40Zusername-removed-112407Kill threadThis fixes some crashes when StdReadErrThread is still running (an producing lots of data, e.g., when there are lots of CRLF warnings) and a dialog is closed using the x-button. It's a condition where the CGit:.Run-thread is terminated a...This fixes some crashes when StdReadErrThread is still running (an producing lots of data, e.g., when there are lots of CRLF warnings) and a dialog is closed using the x-button. It's a condition where the CGit:.Run-thread is terminated and the StdReadErrThread still running and, thus, accessing invalid memory.
https://drdump.com/Problem.aspx?ProblemID=199214
@all Unsure whether to put this in TGit 2.2.0. Trying to put this in a preview release first to get some insights.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/64Update "How To Contribute"2016-06-23T09:10:10Zusername-removed-94717Update "How To Contribute"2 points
- make short version shorter
- add `Coding style` into short version (copied from @mrtux's [comment](https://gitlab.com/tortoisegit/tortoisegit/commit/a5ec71fe0561394fea0fc74b7b055a7dd71aeeb6#note_3732614))2 points
- make short version shorter
- add `Coding style` into short version (copied from @mrtux's [comment](https://gitlab.com/tortoisegit/tortoisegit/commit/a5ec71fe0561394fea0fc74b7b055a7dd71aeeb6#note_3732614))username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/63Fix CMessageBox modal2016-05-17T19:40:54Zusername-removed-138980Fix CMessageBox modalFix CMessageBox modalFix CMessageBox modalhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/61Fixed issue #2767: The online help of Settings->Git->Remote should explain th...2016-05-11T01:47:17Zusername-removed-2381Fixed issue #2767: The online help of Settings->Git->Remote should explain the "Push Default" checkboxThis is an attempt to deal with #2767.This is an attempt to deal with #2767.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/57Drop HTML from messages and use TaskDialog2016-04-20T13:08:04Zusername-removed-112407Drop HTML from messages and use TaskDialogDrop HTML from messages so that we can use MessageBox or TaskDialog.Drop HTML from messages so that we can use MessageBox or TaskDialog.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/59Fix typo2016-04-19T14:31:11Zusername-removed-420434Fix typoFix typoFix typohttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/56Fix double line endings is saved to log file2016-04-14T14:23:46Zusername-removed-94717Fix double line endings is saved to log fileI found some problem with my logfile.txt when opening it with Notepad++, shows:
![image](/uploads/fa1432f01704c24676df24b460006fe7/image.png)
As you can see, there are double line endings(`CR` + `CRLF`), then I found it's introduce...I found some problem with my logfile.txt when opening it with Notepad++, shows:
![image](/uploads/fa1432f01704c24676df24b460006fe7/image.png)
As you can see, there are double line endings(`CR` + `CRLF`), then I found it's introduced when parsing the string. The code:
```
File: \src\TortoiseProc\ProgressDlg.cpp
Func: void CProgressDlg::WriteLog() const
Line: 650
while (*psz_string)
{
if (*psz_string == '\r')
{
++psz_string;
continue;
}
size_t i_len = wcscspn(psz_string, L"\n");
logfile.AddLine(CString(psz_string, (int)i_len));
psz_string += i_len;
if (*psz_string == '\n')
++psz_string;
}
```
If the original string is `line1\r\nline2`, the first line to be added into line list is `line1\r`. The extra `CR` is introduced.
This fixing does 2 things:
- Make sure the string does't include CR or LF before calling AddLine() by correct `i_len` value.
- Just simply strip a pair `CR + LF` or `LF + CR` if any.
----
And I just found the older log, even worst:
![image](/uploads/377e2ce2208042d69cac65bc7cf82b07/image.png)
Empty line is strip! I can't reproduce it for now. :confused: Did you get that?
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/55Fix broken drawing in Revision graph dialog2016-03-28T11:47:41Zusername-removed-94717Fix broken drawing in Revision graph dialogregression of b56f62e0253cf1394fb90c230aed88b74099338f
regression of b56f62e0253cf1394fb90c230aed88b74099338f
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/54Fixed issue #2740: Order of compared references in revision graph is labelled...2016-03-23T10:32:39Zusername-removed-94717Fixed issue #2740: Order of compared references in revision graph is labelled invertedusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/47NULL -> nullptr2016-03-17T20:10:30Zusername-removed-112407NULL -> nullptrMake use of newer C++ features...Make use of newer C++ features...username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/53Fixed issue #2719: Commit & Push in CommitDlg doesn't respect deafult remote ...2016-03-16T02:24:40Zusername-removed-360247Fixed issue #2719: Commit & Push in CommitDlg doesn't respect deafult remote and pushbranch settingsCode moved from CPushDlg::GetRemoteBranch to CGit::GetRemotePushBranch
Code moved from CPushDlg::GetRemoteBranch to CGit::GetRemotePushBranch
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/51Update build.txt for VS2013 Update 5 and the link of Community edition2016-02-29T23:21:26Zusername-removed-94717Update build.txt for VS2013 Update 5 and the link of Community editionusername-removed-112407username-removed-112407