2d65a81050
revert workspace cleanup...
2013-06-07 12:26:24 +02:00
f20a9da861
rename 'bare' option of fetch to not conflict from the one of clone
2013-06-06 19:56:33 +02:00
0ceb86d9f6
fetch : throw error when ahead commit and introduce --force flag
...
return an error that fetch is not allowed when there is ahead commits in bare repository
and introduce a flag --force which, when used, do fetch anyway and loose the ahead commits
2013-06-04 21:14:27 +02:00
22d815f5f6
Add a reference to checkin parameter to the checkin method!
2013-06-04 21:14:26 +02:00
488e3465fe
correct indentation introduced by merge with master
2013-06-04 21:14:24 +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
7e4db38057
Manage clone and init in a bare repository
2013-06-04 21:13:14 +02:00
bb1c055f18
Modify fetch command to manage bare repositories
2013-06-04 21:13:12 +02:00
45493c141a
prevent rcheckin by error in a bare repository
2013-06-04 21:13:11 +02:00
512784426b
if another commit was done in TFS, keep the repository in good state before reporting error
2013-06-04 21:13:08 +02:00
8e9f7f8142
Manage rcheckin in bare repository
2013-06-04 21:13:07 +02:00
4d034293c4
Merge branch 'master' into ignoreexcept
2013-05-29 16:33:13 -05:00
a0b228661e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
GitTfs/Core/GitTfsRemote.cs
2013-05-29 10:23:59 -04:00
106a064c98
Merge pull request #366 from pmiossec/use_saved_author_file
...
Use saved author file for rcheckin commits
2013-05-29 07:09:21 -07:00
68d6d3afc1
Merge pull request #376 from pmiossec/little_clone_improvements
...
Little clone improvements
2013-05-29 09:56:56 -04:00
60190dd1f1
s/in/to
2013-05-29 09:56:24 -04:00
479064a375
Merge pull request #379 from wundram/initbranch-nofetch
...
Added --nofetch option to init-branch
2013-05-29 05:52:40 -07:00
54807c30f5
Added --nofetch option to init-branch to set up TFS remote for branch
...
without doing a fetch. Usefull to check config file before executing
fetch.
Now fails when --all and --nofetch are used on init-branch at the same time
Added test for case with --all and --nofetch
2013-05-27 08:19:59 -05: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
9cf3c578f8
Add messages to help user if one branch is not displayed
2013-05-25 12:09:10 +02:00
20f2eb6832
clone: verify if tfs path exists
2013-05-25 12:01:38 +02:00
ff30f738f4
Correct a strange message when no branches found
2013-05-24 21:34:30 +02:00
770656f44e
Use saved author file for rcheckin commits
2013-05-22 17:01:55 +02:00
a2eeacbaac
Clean workspace after running a tfs command
...
=> clone, fetch, init-branch, checkin, ...
2013-05-20 16:23:37 +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
cea0ad2b1a
Fix newline for branch checkout warning
2013-05-01 16:41:01 -05:00
aa81462a95
RCheckin now has correct author attribution in quick mode too.
...
+ Refactored PerformRCheckin to remove duplicate code
2013-04-24 11:37:46 +02:00
8d88d4540c
Refactored PerformRCheckin
...
- Common checks are still in the base method
- 'Quick' specific code is in _PerformRCheckinQuick
- the non-Quick code is in _PferformRCheckin
2013-04-24 10:03:29 +02:00
d23af4b952
Rename UpdateTfsHead and new purpose for UpdateRef
2013-04-17 14:40:27 +02:00
078a36841f
Merge pull request #349 from pmiossec/clone_crash_no_tfs_root
...
Correct a clone crash when no tfs root found. Closes #348
2013-04-12 14:19:21 -07:00
ddd022bee5
Merge pull request #336 from l3m/correct-authors
...
Correct author attribution
2013-04-12 06:31:01 -07:00
8fc1dcbea0
Correct a crash when no tfs root found #348
2013-04-11 19:07:47 +02:00
d9e439e41a
correct missing branch in help
2013-04-05 11:05:39 +02:00
3872763f27
Rcheckin now passes the GitCommit instance to the checkin options factory.
2013-03-26 14:16:29 +01:00
dda9cfbef1
Added AuthorFilePath and Author fields to Checkin options.
...
Short-cut a ("a|authors" consistent with other uses) is already used by a|autorebase. Used "A|authors" instead.
2013-03-26 14:01:33 +01:00
8eabad8119
Merge pull request #332 from pmiossec/short_option_rcheckin_quick
...
Add a short option `-q` for rcheckin --quick
2013-03-25 08:25:08 -07:00
3264d8bdb8
Add a short option -q for rcheckin quick
2013-03-25 14:29:11 +01:00
d7347c8d93
Correct crash when clone the whole repository
...
Forget to exit after displaying the warning.
Should fix #330
2013-03-25 14:23:25 +01: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
a34bf716de
Add an option '--autorebase' to the 'rcheckin --quick' command to continue with rebasing when new changesets fetched
2013-03-09 11:23:24 +01:00
da4fee0d46
rebase remaining commits on last commit done before exiting
...
... due to external commit detected or error during checkin
2013-03-09 11:23:23 +01:00
6e78b56d4d
rcheckin --quick : reset current branch to tfs remote to be synchronized with tfs
2013-03-09 11:23:21 +01:00
2ca75950cb
better branch command description
2013-02-03 22:37:36 +01:00
e4c4776fb7
Control to detect bad command use
2013-02-03 22:32:56 +01:00
bc1b49c8a8
Add init-branch features to branch command
2013-02-03 22:29:22 +01:00
3c4f45f3c1
Creation branch is no more an option but the main action (like git branch ommand)
...
+ rewrite Run() methods
2013-02-03 22:28:49 +01:00
f5f21f2634
branch command description
2013-02-03 22:18:33 +01:00
b5ba9a07ae
Add option --all to display all the root TFS branches
2013-02-03 22:18:33 +01:00
Philippe Miossec