[PATCH 4/4] cherry-pick/revert: default to topological sorting
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com When 'git cherry-pick' and 'git revert' are used with ranges such as 'git cherry-pick A..B', the order of the commits to pick are determined by the default date-based sorting. If a commit has a commit date before the commit date of its parent, it will therfore be applied before its parent. In the context of cherry-pick/revert, this is most likely not what the user expected, so let's enable topological sorting by default. Signed-off-by: Martin von Zweigbergk martin.von.zweigbe...@gmail.com --- builtin/revert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/revert.c b/builtin/revert.c index 98ad641..6880ce5 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -194,6 +194,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) opts-revs = xmalloc(sizeof(*opts-revs)); init_revisions(opts-revs, NULL); opts-revs-no_walk = REVISION_WALK_NO_WALK_UNSORTED; + opts-revs-topo_order = 1; if (argc 2) usage_with_options(usage_str, options); memset(s_r_opt, 0, sizeof(s_r_opt)); -- 1.7.11.1.104.ge7b44f1 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4] cherry-pick/revert: default to topological sorting
y...@google.com writes: From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com When 'git cherry-pick' and 'git revert' are used with ranges such as 'git cherry-pick A..B', the order of the commits to pick are determined by the default date-based sorting. If a commit has a commit date before the commit date of its parent, it will therfore be applied before its parent. Is that what --topo-order really means? I just tried this: $ git checkout v1.7.12-rc2 $ GIT_COMMITTER_DATE='@0 +' git commit --allow-empty -m old $ git log --pretty=fuller -2 and (obviously) the result shows the old one and then the v1.7.12-rc2. The point of --topo-order is to deal with merges more sensibly, I think, e.g. with a history with this shape with timestamps, ---1247 \ \ 3568--- git log may show 8 7 6 5 4 3 2 1, while git log --topo-order would give you 8 6 5 3 7 4 2 1. And indeed in the context of cherry-pick and revert, topo-order is a more sensible option. So there is nothing wrong in the patch, but the above explanation of yours is flawed. In the context of cherry-pick/revert, this is most likely not what the user expected, so let's enable topological sorting by default. Signed-off-by: Martin von Zweigbergk martin.von.zweigbe...@gmail.com --- builtin/revert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/revert.c b/builtin/revert.c index 98ad641..6880ce5 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -194,6 +194,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) opts-revs = xmalloc(sizeof(*opts-revs)); init_revisions(opts-revs, NULL); opts-revs-no_walk = REVISION_WALK_NO_WALK_UNSORTED; + opts-revs-topo_order = 1; if (argc 2) usage_with_options(usage_str, options); memset(s_r_opt, 0, sizeof(s_r_opt)); -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4] cherry-pick/revert: default to topological sorting
Junio C Hamano gits...@pobox.com writes: y...@google.com writes: From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com When 'git cherry-pick' and 'git revert' are used with ranges such as 'git cherry-pick A..B', the order of the commits to pick are determined by the default date-based sorting. If a commit has a commit date before the commit date of its parent, it will therfore be applied before its parent. Is that what --topo-order really means? And it turns out that the documentation is crappy. Perhaps something like this, but an illustration may not hurt. Documentation/rev-list-options.txt | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index d9b2b5b..c147117 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -579,9 +579,10 @@ Commit Ordering By default, the commits are shown in reverse chronological order. --topo-order:: - - This option makes them appear in topological order (i.e. - descendant commits are shown before their parents). + This option makes them appear in topological order. Even + without this option, descendant commits are shown before + their parents, but this tries to avoid showing commits on + multiple lines of history intermixed. --date-order:: -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
