TortoiseGit merge requestshttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests2017-04-21T13:51:01Zhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/1Add branch revision number for tracking of the source code version of a branc...2017-04-21T13:51:01Zusername-removed-217046Add branch revision number for tracking of the source code version of a branch in automated builds using "git rev-list --count --first-parent"https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/3Fixing Issue #23772015-08-17T11:20:25Zusername-removed-217046Fixing Issue #2377After a branch rename in the Browse References dialog keep the tree selection to the parent of the renamed leaf.After a branch rename in the Browse References dialog keep the tree selection to the parent of the renamed leaf.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/4Fixed issue #2377: don't enter branch directory when renaming a branch.2015-08-18T14:13:51Zusername-removed-217046Fixed issue #2377: don't enter branch directory when renaming a branch.Resubmitting the merge request after doing fixes.
Extension to MR !3.Resubmitting the merge request after doing fixes.
Extension to MR !3.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/5Fixing Issue #2337: Commit dialog: recent commit messages list isn't updated ...2015-08-18T14:14:19Zusername-removed-217046Fixing Issue #2337: Commit dialog: recent commit messages list isn't updated aft…Fixing Issue #2337: Commit dialog: recent commit messages list isn't updated after commits in other dialog windows
This could be pretty annoying issue as people would find loosing their commit message history or not displaying the cor...Fixing Issue #2337: Commit dialog: recent commit messages list isn't updated after commits in other dialog windows
This could be pretty annoying issue as people would find loosing their commit message history or not displaying the correct commit message history quite a serious issue. The fix I have implemented is to always reload the current commit history before displaying or inserting a new one. Reloading the history from the registry multiple times should be a tiny performance hit.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/9Fixed issue #2470: Disable "Esc" key in Log Message dialog2015-08-24T23:13:11Zusername-removed-217046Fixed issue #2470: Disable "Esc" key in Log Message dialoghttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/12Fixed issue #2568: Add Fast Forward Only option to the merge dialog (--ff-only)2015-08-25T15:49:17Zusername-removed-217046Fixed issue #2568: Add Fast Forward Only option to the merge dialog (--ff-only)https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/26Re-initialize libgit2 filter when re-initializing git2016-04-07T17:36:57Zusername-removed-138980Re-initialize libgit2 filter when re-initializing gitRe-initialize libgit2 filter when re-initializing git
Re-initialize libgit2 settings only if CGit instance is default
Re-initialize libgit2 filter when re-initializing git
Re-initialize libgit2 settings only if CGit instance is default
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/34Issue #2629: "Browse References" listview's sort column + order is now persis...2016-01-02T12:31:38Zusername-removed-297762Issue #2629: "Browse References" listview's sort column + order is now persistentusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/41Fix typo2016-02-06T09:01:35Zusername-removed-360247Fix typohttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/42Fix typo2016-02-13T09:54:36Zusername-removed-360247Fix typohttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/50Fixed issue #2710: Allow start-commit hook to prevent the Commit dialog from ...2016-10-29T11:42:01Zusername-removed-94717Fixed issue #2710: Allow start-commit hook to prevent the Commit dialog from showing.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/58Fix user setting dependency in tests2016-04-30T16:20:19Zusername-removed-420434Fix user setting dependency in testsLogDataVector unit tests were dependent on log sort order user setting. The tests would fail if sort order was not set to LOG_ORDER_TOPOORDER. This patch fixes that.
LogDataVector unit tests were dependent on log sort order user setting. The tests would fail if sort order was not set to LOG_ORDER_TOPOORDER. This patch fixes that.
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/60Fix getting prompted to enter a user name and email when rebasing even though...2016-04-22T15:52:46Zusername-removed-420434Fix getting prompted to enter a user name and email when rebasing even though valid user name and email exists.The problem is that gitdll.c::get_windows_home_directory() would hold a pointer to the home environment variable which would later get blown away causing the current static pointer to be pointing at garbage memory.
This problem manife...The problem is that gitdll.c::get_windows_home_directory() would hold a pointer to the home environment variable which would later get blown away causing the current static pointer to be pointing at garbage memory.
This problem manifested itself in the rebase dialog. When the user chose to rebase, the user would get prompted with "User name and email must be set before commit. Do you want to set these now?" even though the user had the user name and email set properly.
Run the following on a repository that could be rebased:
```
/command:rebase /path:C:\Path\To\Repo\That\Could\Get\Rebased
```
Hit "Start Rebase" or "Fast Forward" and you will be prompted with a prompt letting you know that you need to enter user name and email even though you don't need to.
Note: I am not 100% sure this is the correct fix to this issue but this is stab #1 at coming up with a working resolution.
Also... this appears to be caused by a fairly recent modification to the TGit repository: 6abcae1ehttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/62"Add basic worktree support"2017-03-19T19:54:02Zusername-removed-420434"Add basic worktree support"This patch set is meant to start addressing #2619 which is to enable support for the new worktree functionality.
This patch includes the work of:
Patrick Steinhardt: submitted a [pull request](https://github.com/libgit2/libgit2/pul...This patch set is meant to start addressing #2619 which is to enable support for the new worktree functionality.
This patch includes the work of:
Patrick Steinhardt: submitted a [pull request](https://github.com/libgit2/libgit2/pull/3436) (that has not yet been accepted) to the libgit2 project
@ch3cooli: started implementing the new worktree support into tortoisegit
I have been using the first couple of evolutions of this patchset in my production work environment and have finally got it to a point where it is ready to be presented to the general public for more suggestions.
I realize that the the upstream Git community still calls git worktree's experimental, however I need this in production and the git-for-windows community does not support the predecessor to git worktree [git-new-workdir](https://github.com/git-for-windows/git/pull/622) and would like to now start supporting worktree
Known to be working:
* Ordinary operations of tortoise git
* All tests pass
* Linked worktree's now work with TortoiseGitProc
* Linked worktree's now work with TGitCache
* A couple more tests were added to test worktrees.
Known Issues
* Attempting to delete a branch from a disconnected worktree throws error "Could not delete reference. libgit2 returned: Reference 'refs/heads/branch' not found"
will need more debugging)
* More tests could afford to be written for worktrees
* Need to test this patch set with TGitMerge/TGitIDiff. One specific thing to test is "Does resolving conflicts from TGitMerge/TGitIDiff work"
Former Known Issues that are now resolved
* Files in submodules do not appear to be reporting proper file status via TGitCache (which makes sense due to the .git file that worktree uses as well so that
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/66No need gtest.h for gtest project2016-07-10T01:32:51Zusername-removed-94717No need gtest.h for gtest projectgtest.h is already included in gtest-all.cc
I also think no need "Header Files" filter, so remove it too.gtest.h is already included in gtest-all.cc
I also think no need "Header Files" filter, so remove it too.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/68Ignore ref. range of git log while showing all references2016-09-26T05:48:43Zusername-removed-94717Ignore ref. range of git log while showing all referencesThe steps of the little bug:
1. Show branch A and B
2. Delete B
3. Show "All Branches/All basic refs/All local branches", and popup error message box:
![image](/uploads/e92f091d5bcdcad9b8464a016f4b7844/image.png)The steps of the little bug:
1. Show branch A and B
2. Delete B
3. Show "All Branches/All basic refs/All local branches", and popup error message box:
![image](/uploads/e92f091d5bcdcad9b8464a016f4b7844/image.png)username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/69Fixed issue #2833: Pull with pull.rebase=preserve does rebase on invalid upst...2016-11-20T21:15:36Zusername-removed-360247Fixed issue #2833: Pull with pull.rebase=preserve does rebase on invalid upstreamhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/74Show current branch on context menu of browse references2017-03-21T00:02:37Zusername-removed-94717Show current branch on context menu of browse referencesMay be useful while there are so many branches and user can't figure out which branch is current immediately.May be useful while there are so many branches and user can't figure out which branch is current immediately.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/75Fixed issue #2964: blame: gloss over per-line commit reference if duplicated2017-07-01T17:12:32Zusername-removed-94717Fixed issue #2964: blame: gloss over per-line commit reference if duplicatedVS2013 Debugging / Command Arguments: **D:\TortoiseGit\architecture.txt**VS2013 Debugging / Command Arguments: **D:\TortoiseGit\architecture.txt**username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/76Added Use '--first-parent' toggle2017-06-10T19:49:35Zusername-removed-1274395Added Use '--first-parent' toggleSigned-off-by: Filip Nicki <filip@wtfast.com>
Issue: https://gitlab.com/tortoisegit/tortoisegit/issues/2978Signed-off-by: Filip Nicki <filip@wtfast.com>
Issue: https://gitlab.com/tortoisegit/tortoisegit/issues/2978