Added option to avoid replicating TFS merges during fetch #582
Conversation
Sometimes TFS guys do merge changesets apparently at random, while in git merge-commit has meaning that _all_ commits in the parent branches are merged. Thus preserving all of the merges sometimes do more harm than good. New setting is tfs.replicateTfsMerges and could be "0" or "1". This setting is turned on by default (i.e. if there's no such value in the git config file - it treats as "1") and is global (not tied to particular tfs remote/branch - mostly because on the per-tfs-remote basis it can do much confusion if configured differently in different places.
| @@ -27,6 +27,7 @@ public OptionSet OptionSet | |||
| { "ignorecase=", "Ignore case in file paths (default: system default)", | |||
| v => GitInitIgnoreCase = ValidateIgnoreCaseValue(v) }, | |||
| {"bare", "Clone the TFS repository in a bare git repository", v => IsBare = v != null}, | |||
| {"m|replicateTfsMerges", "Mark TFS merge changesets as merge commits in git", v => ReplicateTfsMerges = v == null || v == "1"}, | |||
There was a problem hiding this comment.
This branch changes the default from ReplicateTfsMerges = true to ReplicateTfsMerges = false. @ivan-danilov, @pmiossec - what do you think the default behavior should be?
There was a problem hiding this comment.
I prefer default value to ReplicateTfsMerges = true...
There was a problem hiding this comment.
That would have been my guess. If true is a reasonable default, let's rename the option --ignore-tfs-merges or --no-tfs-merges.
|
🤘 I like this. |
|
Also, there is already the same option introduced in #480 ( See pmiossec@f06cba9?w=1 ) |
|
@pmiossec huh, then probably your changes are better suited here ...when they'd be merged in at least :) |
Sometimes TFS guys do merge changesets apparently at random, while in git merge-commit has meaning that all commits in the parent branches are merged. Thus preserving all of the merges sometimes do more harm than good. New setting is tfs.replicateTfsMerges and could be "0" or "1". This setting is turned on by default (i.e. if there's no such value in the git config file - it treats as "1") and is global (not tied to particular tfs remote/branch - mostly because on the per-tfs-remote basis it can do much confusion if configured differently in different places.