4e18d1ec82
Do even less cleanup.
2013-06-08 06:56:49 -04:00
22d815f5f6
Add a reference to checkin parameter to the checkin method!
2013-06-04 21:14:26 +02:00
c1b461ec03
corrections....
2013-06-04 21:14:23 +02:00
191fad0ee3
refactoring of how get ref for a head branch...
2013-06-04 21:14:21 +02:00
ff0de1c560
Add branch support in fetch and rcheckin for a bare repository
...
But should specify the git branch name that should be updated with --bare option
Use :
git tfs fetch --bare=master
git tfs fetch --bare=branch1 -i branch1
git tfs rcheckin --bare=master
git tfs rcheckin --bare=branch1 -i branch1
2013-06-04 21:14:19 +02:00
8e9f7f8142
Manage rcheckin in bare repository
2013-06-04 21:13:07 +02:00
2ef7feb69d
update libgit2sharp to v0.12
2013-06-04 00:31:25 +02:00
2d612bc19c
Extract the ignore logic.
...
Working towards #381 and #not-a-hack.
2013-06-03 08:36:23 -04:00
2071076682
was ((i1 && !e1) || (i2 && !e2)), is (i1 || i2) && !(e1 || e2)
2013-06-03 07:48:01 -04:00
77edbdc0bb
Updated signature on IsIgnored method to require all three arguments
2013-05-29 16:38:16 -05:00
4d034293c4
Merge branch 'master' into ignoreexcept
2013-05-29 16:33:13 -05:00
36b48acbb4
Reuse the index scrubber.
2013-05-29 10:41:28 -04:00
3efd3c3e42
Less shelling
2013-05-29 10:32:43 -04:00
f2e140f72c
I didn't mean to change this.
2013-05-29 10:26:10 -04:00
a0b228661e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
GitTfs/Core/GitTfsRemote.cs
2013-05-29 10:23:59 -04:00
0680742a44
Resolve a couple of things.
2013-05-29 10:19:10 -04:00
ec02c285f6
Revert "Introduce FindCommonGitCommit"
...
This reverts commit 34cef5d7d0
2013-05-29 10:13:40 -04:00
bf61edfcc1
Added an additional ignore-except config option to add exceptions to files
...
ignored by the ignore-paths option. For example if you want to ignore all
exe files except the .nuget/NuGet.exe file, you can add exe$ to the ignore-paths
and ^\.nuget to the ignore-except.
Added --except-regex command line option to RemoteOptions to set ignore-except
config.
New tfs-remotes for branches now will copy the ignore-paths and ingore-except
options from the default tfs remote.
2013-05-27 08:14:09 -05:00
20f2eb6832
clone: verify if tfs path exists
2013-05-25 12:01:38 +02:00
47d3a27532
Merge pull request #357 from l3m/quick-authors
...
Correct author attribution for RCheckin Quick
2013-05-08 07:24:34 -07:00
a5b56e8223
Merge pull request #361 from spraints/update-ref
...
Replace Process.Start with libgit2sharp. (closes #360 )
2013-05-08 06:54:05 -07:00
f1d3f18e3e
Use the new refs API.
...
Thanks @Saaman!!!!
2013-05-03 16:21:36 -04:00
09606b228d
Eliminate Process.Start("git", "update-ref", ...)
2013-04-29 12:00:34 -04:00
bac056c50e
Update libgit2sharp.
2013-04-29 11:48:51 -04:00
34cef5d7d0
Introduce FindCommonGitCommit
...
Instead of relying on the base changeset IDs coming from the shelveset,
the first git commit that is found to contain the exact SHA1 for all
the files in the shelveset is used as the parent.
2013-04-25 18:47:32 +02:00
462dcc285a
GitCommit can now return (forward) Sha of the wrapped commit.
2013-04-24 10:39:26 +02:00
bb9d724b1d
Replace git command update-ref by a LibGit2Sharp call to UpdateRef()
2013-04-22 21:57:32 +02:00
22100d99cc
Try to use full path in HashAndInsertObject in bare repositories. Fixes #285 .
2013-04-18 14:17:47 -04:00
385bc316e3
Fix Fetch for initial commit
2013-04-17 15:06:37 +02:00
db9a445089
Unshelve based on the parent changeset Id
2013-04-17 14:40:49 +02:00
74ae60fc5f
Compute base changeset Id
2013-04-17 14:40:28 +02:00
d23af4b952
Rename UpdateTfsHead and new purpose for UpdateRef
2013-04-17 14:40:27 +02:00
3ab6e3f0d2
Read parent tree into the index before applying changes
2013-04-17 14:40:27 +02:00
ddd022bee5
Merge pull request #336 from l3m/correct-authors
...
Correct author attribution
2013-04-12 06:31:01 -07:00
eddb571739
Merge remote-tracking branch 'origin/master' into workspace-fix
2013-04-04 22:31:04 -04:00
b7236a1375
Updated GitCommit.AuthorAndEmail property according to sc68cal's suggestion.
2013-03-27 17:15:55 +01:00
86bc1a4b77
Fixed code that failed test WorkspaceTests.Policy_failed_and_Force_with_an_OverrideReason.
...
- Updated test calls.
- Removed duplicate versions of Checkin and EvaluateCheckin without author.
2013-03-26 15:59:48 +01:00
06fd1648e3
TfsWorkspace now passes the author parameter to Checkin(...)
2013-03-26 14:18:00 +01:00
43f8b6a475
Added author parameter to Checkin method.
...
- Added IWorkspace.Checkin overload that takes an author parameter
- Implemented the method in the VSx-Wrappers.
2013-03-26 13:56:49 +01:00
16583f25ae
Extended GitCommit with a property to retrieve the git author name/email tuple.
2013-03-26 13:45:24 +01:00
52c6af1ba2
Merge remote-tracking branch 'origin/master' into gitattributes-added
...
Conflicts:
GitTfs.sln
2013-03-25 11:39:23 -07:00
8b921e4cf3
Removed duplicated line after Matt's review.
2013-03-21 14:53:28 +02:00
e74170291a
Fix: Rcheckin ignores --no-build-default-comment option (during rcheckin of merge commit prevents including all comments from merged commits below original merge-commit comment in git)
2013-03-21 14:53:28 +02:00
690ccef82e
Normalized line endings to be LF in repository (line ending in the working copy managed by core.autocrlf option)
2013-03-21 14:35:22 +02:00
32ff983b9e
Only proactively clean up .git/tfs/workspace.
2013-03-19 10:15:22 -04:00
a2060cf5a4
Merge remote-tracking branch 'origin/master' into delorder
...
Conflicts:
GitTfs/Core/GitRepository.cs
2013-03-18 17:48:54 -04:00
10aa79170d
All green.
2013-03-18 17:42:18 -04:00
6df2b209ed
whitespace
2013-03-18 17:07:41 -04:00
416543cd7a
Fix: git-tfs tries to authenticate against all TFS instances in the branch no matter how old they were in use and if they needed at all.
...
Our TFS instance recently changed URL and without this change it is required to filter-branch entire repository and change every git-tfs-id line in comments just to make git-tfs stop going to old URL to check. With it one should just keep config section for old branch and change the very last commit's comment (for each TFS branch). Also theoretically should save some time if several TFS instances are used as only specified with -i option is authenticated against.
2013-03-11 15:47:16 +02:00
6e78b56d4d
rcheckin --quick : reset current branch to tfs remote to be synchronized with tfs
2013-03-09 11:23:21 +01:00
Matt Burke