git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Cherry-pick picks more commits (and miss some) than provided
@ 2020-07-29 16:53 Eugen Konkov
  2020-07-29 18:09 ` Elijah Newren
  0 siblings, 1 reply; 2+ messages in thread
From: Eugen Konkov @ 2020-07-29 16:53 UTC (permalink / raw)
  To: Git Mailing List

Hello Git,

$ git --version
git version 2.28.0


If I do
git cherry-pick 90a075bf f2c161b7^..ae27237e fb7e608e f34c9562 76f2568a fb141148

then more commits are copied and some commits are ignored
But when I do step by step then every thing is OK

git cherry-pick 90a075bf
git cherry-pick f2c161b7^..ae27237e
git cherry-pick fb7e608e f34c9562 76f2568a fb141148

Look at history before and after cherry-picking:

Before:
> fb141148 (local/dev) Delete confirmation
> 76f2568a SCHEMA 182: Added CHECK for passport data
> 7d0364c2 Use push to insert run obj to the array
> f34c9562 FIX: tooltip without tabulator div element
> fb7e608e Added defolt values for the p_tabulator
> 8bf04fcb Get table rows and insert they to a the table
> b52ce1f0 Use push to insert run obj to the array
> 335f23e2 Implement MsOffice::Word::Surgeon
> 0e5f8572 Added form to fill documents
> ae27237e Added form for mailing
> 3aa1b57c FIX: Removed doudled rows grouped by agreement
> 4afba7c4 Rename length -> rest, added comments
> 820f5d27 Implement options for reminding script
> 758d674b Update list again
> d96b2830 Do not mark documents as mailed while testing
> 8099effd Suspend reminding
= b7e56267 Reminding
= c1502c4e Remove line
> 3ef8eebc Added 'Invoice' verification
> 45c7d97a Rename btnPanel -> btnPnl
> 013995be Added highlight_bsd_row when pd row is deleted
> ab3af047 Use  formatter: "money" for 'suma' cell
> 7576249f Change rowClick -> rowDblClick
> a78fc015 FIX: btnPanel is not a function
> f58cee53 Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
> d2a68243 Added opportunity to prow documents
> 06a1060c FIX: Prow schet: 681 -> 361
> 53bc499b Allow many Prow at once
> f2c161b7 Allow many Prow at once
= 84180ade Added docdate column for p_tabulator
> 90a075bf Added mismatch report for msg:'Too many results:2 obtained'
| < e9cc2aa7 (HEAD -> dev) Play with Google OAuth
| < 45b7e647 Manual dumping for testing purpose
| = 56e0bc50 (xtucha/dev) Reminding
| = 9b9849fd Display date field
| = be498fae Remove line
|/  
o cb4a004b Do not show saldo for Internet invoices


After:
= f91b4583 (HEAD -> dev) Delete confirmation
= f9a371c8 SCHEMA 182: Added CHECK for passport data
= bcd3e4e9 FIX: tooltip without tabulator div element
= 8b695e08 Use push to insert run obj to the array
= 15e7de1e Added defolt values for the p_tabulator
= e2f18b8e Get table rows and insert they to a the table
= ab813f58 Use push to insert run obj to the array
= 00146b97 Implement MsOffice::Word::Surgeon
= 64258d59 Added form to fill documents
= fa6b6ccd Added form for mailing
= 21b52c6d FIX: Removed doudled rows grouped by agreement
= 93d44323 Rename length -> rest, added comments
= fc94fe09 Implement options for reminding script
= 40503f4b Update list again
= 73afd954 Do not mark documents as mailed while testing
= 477fc86d Suspend reminding
= 9493156e Added 'Invoice' verification
= 19164b0d Rename btnPanel -> btnPnl
= 8d760e51 Added highlight_bsd_row when pd row is deleted
= 69e9e548 Use  formatter: "money" for 'suma' cell
= f651d0ed Change rowClick -> rowDblClick
= 62d12ec7 FIX: btnPanel is not a function
= 6503edf3 Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
= f533ff36 Added opportunity to prow documents
= 217902d2 FIX: Prow schet: 681 -> 361
= 58adb0f4 Allow many Prow at once
= 2fdf2877 Allow many Prow at once
< e9cc2aa7 Play with Google OAuth
< 45b7e647 Manual dumping for testing purpose
= 56e0bc50 (xtucha/dev) Reminding
= 9b9849fd Display date field
= be498fae Remove line
| = fb141148 (local/dev) Delete confirmation
| = 76f2568a SCHEMA 182: Added CHECK for passport data
| = 7d0364c2 Use push to insert run obj to the array
| = f34c9562 FIX: tooltip without tabulator div element
| = fb7e608e Added defolt values for the p_tabulator
| = 8bf04fcb Get table rows and insert they to a the table
| = b52ce1f0 Use push to insert run obj to the array
| = 335f23e2 Implement MsOffice::Word::Surgeon
| = 0e5f8572 Added form to fill documents
| = ae27237e Added form for mailing
| = 3aa1b57c FIX: Removed doudled rows grouped by agreement
| = 4afba7c4 Rename length -> rest, added comments
| = 820f5d27 Implement options for reminding script
| = 758d674b Update list again
| = d96b2830 Do not mark documents as mailed while testing
| = 8099effd Suspend reminding
| = b7e56267 Reminding
| = c1502c4e Remove line
| = 3ef8eebc Added 'Invoice' verification
| = 45c7d97a Rename btnPanel -> btnPnl
| = 013995be Added highlight_bsd_row when pd row is deleted
| = ab3af047 Use  formatter: "money" for 'suma' cell
| = 7576249f Change rowClick -> rowDblClick
| = a78fc015 FIX: btnPanel is not a function
| = f58cee53 Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
| = d2a68243 Added opportunity to prow documents
| = 06a1060c FIX: Prow schet: 681 -> 361
| = 53bc499b Allow many Prow at once
| = f2c161b7 Allow many Prow at once
| = 84180ade Added docdate column for p_tabulator
| > 90a075bf Added mismatch report for msg:'Too many results:2 obtained'
|/  
o cb4a004b Do not show saldo for Internet invoices

Here history after step-by-step cherry picking:

= 91a14a19 (HEAD -> dev) Delete confirmation
= 0f8d9449 SCHEMA 182: Added CHECK for passport data
= 0150098b FIX: tooltip without tabulator div element
= 09fb6335 Added defolt values for the p_tabulator
= 301d0894 Added form for mailing
= cfd579a3 FIX: Removed doudled rows grouped by agreement
= 01adfdd8 Rename length -> rest, added comments
= 41df6d2d Implement options for reminding script
= b3b8039b Update list again
= 6e728987 Do not mark documents as mailed while testing
= fb3c8e6d Suspend reminding
= ee345786 Added 'Invoice' verification
= 0ba9ee11 Rename btnPanel -> btnPnl
= 14f627fb Added highlight_bsd_row when pd row is deleted
= 28c237e1 Use  formatter: "money" for 'suma' cell
= 9e03486e Change rowClick -> rowDblClick
= 4fb5c652 FIX: btnPanel is not a function
= f1528390 Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
= 9918bd67 Added opportunity to prow documents
= f0b86d08 FIX: Prow schet: 681 -> 361
= 29be8500 Allow many Prow at once
= 3a655cb2 Allow many Prow at once
= c2094b0e Added mismatch report for msg:'Too many results:2 obtained'
< e9cc2aa7 Play with Google OAuth
< 45b7e647 Manual dumping for testing purpose
= 56e0bc50 (xtucha/dev) Reminding
= 9b9849fd Display date field
= be498fae Remove line
| = fb141148 (local/dev) Delete confirmation
| = 76f2568a SCHEMA 182: Added CHECK for passport data
| > 7d0364c2 Use push to insert run obj to the array
| = f34c9562 FIX: tooltip without tabulator div element
| = fb7e608e Added defolt values for the p_tabulator
| > 8bf04fcb Get table rows and insert they to a the table
| > b52ce1f0 Use push to insert run obj to the array
| > 335f23e2 Implement MsOffice::Word::Surgeon
| > 0e5f8572 Added form to fill documents
| = ae27237e Added form for mailing
| = 3aa1b57c FIX: Removed doudled rows grouped by agreement
| = 4afba7c4 Rename length -> rest, added comments
| = 820f5d27 Implement options for reminding script
| = 758d674b Update list again
| = d96b2830 Do not mark documents as mailed while testing
| = 8099effd Suspend reminding
| = b7e56267 Reminding
| = c1502c4e Remove line
| = 3ef8eebc Added 'Invoice' verification
| = 45c7d97a Rename btnPanel -> btnPnl
| = 013995be Added highlight_bsd_row when pd row is deleted
| = ab3af047 Use  formatter: "money" for 'suma' cell
| = 7576249f Change rowClick -> rowDblClick
| = a78fc015 FIX: btnPanel is not a function
| = f58cee53 Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
| = d2a68243 Added opportunity to prow documents
| = 06a1060c FIX: Prow schet: 681 -> 361
| = 53bc499b Allow many Prow at once
| = f2c161b7 Allow many Prow at once
| = 84180ade Added docdate column for p_tabulator
| = 90a075bf Added mismatch report for msg:'Too many results:2 obtained'
|/  
o cb4a004b Do not show saldo for Internet invoices



git cherry-pick 90a075bf f2c161b7^..ae27237e fb7e608e f34c9562 76f2568a fb141148
[dev 2fdf2877] Allow many Prow at once
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Fri Jul 10 12:08:49 2020 +0300
 1 file changed, 24 insertions(+), 1 deletion(-)
[dev 58adb0f4] Allow many Prow at once
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 15 11:35:25 2020 +0300
 1 file changed, 22 insertions(+)
[dev 217902d2] FIX: Prow schet: 681 -> 361
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Sat Jul 11 13:58:02 2020 +0300
 1 file changed, 1 insertion(+), 1 deletion(-)
[dev f533ff36] Added opportunity to prow documents
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Sat Jul 11 18:27:26 2020 +0300
 3 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 lib/MaitreD/Controller/Operation/Document.pm
[dev 6503edf3] Rename 'ОПЛАТЫ' -> 'ПЛАТЕЖИ'
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Mon Jul 13 12:08:20 2020 +0300
 2 files changed, 2 insertions(+), 2 deletions(-)
[dev 62d12ec7] FIX: btnPanel is not a function
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Mon Jul 13 13:36:18 2020 +0300
 1 file changed, 3 insertions(+), 3 deletions(-)
[dev f651d0ed] Change rowClick -> rowDblClick
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Mon Jul 13 13:42:19 2020 +0300
 1 file changed, 1 insertion(+), 10 deletions(-)
[dev 69e9e548] Use  formatter: "money" for 'suma' cell
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 14 17:09:36 2020 +0300
 6 files changed, 62 insertions(+), 58 deletions(-)
[dev 8d760e51] Added highlight_bsd_row when pd row is deleted
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 14 18:33:45 2020 +0300
 1 file changed, 7 insertions(+)
[dev 19164b0d] Rename btnPanel -> btnPnl
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 15 11:58:52 2020 +0300
 1 file changed, 2 insertions(+), 2 deletions(-)
[dev 9493156e] Added 'Invoice' verification
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 15 13:05:54 2020 +0300
 1 file changed, 3 insertions(+)
On branch dev
Cherry-pick currently in progress.
  (run "git cherry-pick --continue" to continue)
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
nothing added to commit but untracked files present (use "git add" to track)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
kes@work ~/t $ git cherry-pick --skip
On branch dev
Cherry-pick currently in progress.
  (run "git cherry-pick --continue" to continue)
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
$ git cp --skip
[dev 477fc86d] Suspend reminding
 Date: Wed Jul 15 14:38:48 2020 +0300
 2 files changed, 13 insertions(+), 5 deletions(-)
[dev 73afd954] Do not mark documents as mailed while testing
 Date: Wed Jul 15 14:46:49 2020 +0300
 2 files changed, 6 insertions(+), 6 deletions(-)
[dev 40503f4b] Update list again
 Date: Wed Jul 15 16:08:54 2020 +0300
 1 file changed, 11 insertions(+), 7 deletions(-)
[dev fc94fe09] Implement options for reminding script
 Date: Wed Jul 15 18:28:36 2020 +0300
 1 file changed, 23 insertions(+), 2 deletions(-)
[dev 93d44323] Rename length -> rest, added comments
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 15 18:29:14 2020 +0300
 1 file changed, 5 insertions(+), 3 deletions(-)
[dev 21b52c6d] FIX: Removed doudled rows grouped by agreement
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 15 18:54:28 2020 +0300
 1 file changed, 19 insertions(+), 11 deletions(-)
[dev fa6b6ccd] Added form for mailing
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Thu Jul 16 19:33:09 2020 +0300
 5 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 lib/MaitreD/Controller/Send.pm
 create mode 100644 templates/send/form.html.ep
[dev 64258d59] Added form to fill documents
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 21 18:33:48 2020 +0300
 4 files changed, 338 insertions(+)
 create mode 100644 lib/MaitreD/Controller/Docs.pm
 create mode 100644 templates/docs/form.html.ep
[dev 00146b97] Implement MsOffice::Word::Surgeon
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 21 18:35:28 2020 +0300
 2 files changed, 1710 insertions(+), 1688 deletions(-)
[dev ab813f58] Use push to insert run obj to the array
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 22 17:38:20 2020 +0300
 1 file changed, 29 insertions(+), 27 deletions(-)
[dev e2f18b8e] Get table rows and insert they to a the table
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Fri Jul 24 18:48:16 2020 +0300
 1 file changed, 66 insertions(+), 49 deletions(-)
[dev 15e7de1e] Added defolt values for the p_tabulator
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 28 13:16:14 2020 +0300
 1 file changed, 10 insertions(+), 6 deletions(-)
[dev 8b695e08] Use push to insert run obj to the array
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 22 17:32:04 2020 +0300
 1 file changed, 1 deletion(-)
[dev bcd3e4e9] FIX: tooltip without tabulator div element
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Tue Jul 28 17:49:23 2020 +0300
 1 file changed, 3 insertions(+), 1 deletion(-)
[dev f9a371c8] SCHEMA 182: Added CHECK for passport data
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 29 13:22:54 2020 +0300
 13 files changed, 10151 insertions(+), 5 deletions(-)
 create mode 100644 share/fixtures/182/conf/accounting.json
 create mode 100644 share/fixtures/182/conf/all_tables.json
 create mode 100644 share/fixtures/182/conf/initial.json
 create mode 100644 share/fixtures/182/conf/service.json
 create mode 100644 share/fixtures/182/conf/timezone.json
 create mode 100644 share/migrations/PostgreSQL/deploy/182/001-auto-__VERSION.sql
 create mode 100644 share/migrations/PostgreSQL/deploy/182/001-auto.sql
 create mode 100644 share/migrations/PostgreSQL/downgrade/182-181/001-auto.sql
 create mode 100644 share/migrations/PostgreSQL/upgrade/181-182/001-auto.sql
 create mode 100644 share/migrations/_source/deploy/182/001-auto-__VERSION.yml
 create mode 100644 share/migrations/_source/deploy/182/001-auto.yml
[dev f91b4583] Delete confirmation
 Author: Eugen  Konkov <kes-kes@yandex.ru>
 Date: Wed Jul 29 15:19:24 2020 +0300
 1 file changed, 12 insertions(+), 5 deletions(-)



-- 
Best regards,
Eugen Konkov


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Cherry-pick picks more commits (and miss some) than provided
  2020-07-29 16:53 Cherry-pick picks more commits (and miss some) than provided Eugen Konkov
@ 2020-07-29 18:09 ` Elijah Newren
  0 siblings, 0 replies; 2+ messages in thread
From: Elijah Newren @ 2020-07-29 18:09 UTC (permalink / raw)
  To: Eugen Konkov; +Cc: Git Mailing List

On Wed, Jul 29, 2020 at 10:00 AM Eugen Konkov <kes-kes@yandex.ru> wrote:
>
> Hello Git,
>
> $ git --version
> git version 2.28.0
>
>
> If I do
> git cherry-pick 90a075bf f2c161b7^..ae27237e fb7e608e f34c9562 76f2568a fb141148
>
> then more commits are copied and some commits are ignored

This says to pick all the commits in the history of 90a075bf or
ae27237e or fb7e608e or f34c9562 or 76f2568a or fb141148 that are not
in the history of f2c161b7^.  In other words, it'll cherry-pick all
the commits that show up in the output of either
  git rev-list 90a075bf f2c161b7^..ae27237e fb7e608e f34c9562 76f2568a fb141148
or, equivalently, the output of
  git rev-list 90a075bf ae27237e fb7e608e f34c9562 76f2568a fb141148
--not f2c161b7^

> But when I do step by step then every thing is OK
>
> git cherry-pick 90a075bf
> git cherry-pick f2c161b7^..ae27237e
> git cherry-pick fb7e608e f34c9562 76f2568a fb141148

This is very different.  This says to pick all the commits in the
history of ae27237e that are not in the history of f2c161b7^, plus
grab commits 90a075bf, fb7e608e, f34c9562, 76f2568a, and fb141148.

The only cases when the two would mean the same thing are when all of
90a075bf, fb7e608e, f34c9562, 76f2568a, and fb141148 have f2c161b7^ as
their parent.

This comes from this part of the manual:
       <commit>...
           Commits to cherry-pick. For a more complete list of ways to
spell commits, see gitrevisions(7). Sets of
           commits can be passed but no traversal is done by default,
as if the --no-walk option was specified, see
           git-rev-list(1). Note that specifying a range will feed all
<commit>... arguments to a single revision
           walk (see a later example that uses maint master..next).

The fact that you specified a range (f2c161b7^..ae27237e) among your
arguments, meant that the implicit --no-walk was omitted and now all
arguments became ranges.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-29 18:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 16:53 Cherry-pick picks more commits (and miss some) than provided Eugen Konkov
2020-07-29 18:09 ` Elijah Newren

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).