Hi Pascal, Dario,
I did a git rebase -I HEAD~2 (any a few others). That seems to work, but not
the subsequent push. I’ve attached a log if that helps.
Regards
David
From: Wireshark-dev [mailto:[email protected]] On Behalf Of
Pascal Quantin
Sent: Monday, June 11, 2018 9:48 AM
To: Developer support list for Wireshark <[email protected]>
Subject: Re: [Wireshark-dev] Push failed after amend (Change 27518)
Hi David,
Le lun. 11 juin 2018 à 09:29, <[email protected]
<mailto:[email protected]> > a écrit :
I still have to learn a lot. I’ve got a pending review, so I’ve updated my
code, amended as I thought I needed to, and tried to push once more (as I did
last time except the last push did not have the author populated).
However I get an error:
==
remote: Processing changes: refs: 1, done
To ssh://code.wireshark.org:29418/wireshark
<http://code.wireshark.org:29418/wireshark>
! [remote rejected] HEAD -> refs/publish/master/dicom-heuristic
(duplicate request)
error: failed to push some refs to
'ssh://[email protected]:29418/wireshark
<http://[email protected]:29418/wireshark> '
Done
==
Any advice?
That probably means that you have at least two separate commits that use the
same Change-Id (while each commit must have a different one). So inspect your
history and either squash the commits together or use separate ids for bot h
commits (you can edit your commits with git rebase -i).
Best regards,
Pascal.
user@CLIENT1 MINGW64 /c/Development/current/wireshark (dicom-heuristic)
$ git rebase -i HEAD~2
Successfully rebased and updated refs/heads/dicom-heuristic.
user@CLIENT1 MINGW64 /c/Development/current/wireshark (dicom-heuristic)
$ git log
commit 605c694d8cc2dc8b4d6b55c7be00d8754d38594b (HEAD -> dicom-heuristic)
Author: David Aggeler <[email protected]>
Date: Mon Jun 11 09:16:22 2018 +0200
packet-dcm.c:
Updated according to review comments
==
- Fixed initial COL_INFO for associations. It used to 'append' instead of
'set'.
- Changed initial length check from tvb_reported_length() to
tvb_captured_length()
- Heuristic Dissection:
o Modified registration, so it can be clearly identified in the
Enable/Disable Protocols dialog
o Enabled by default and
o Renamed heuristic protocol from 'dicom_tcp' to 'dicom_any_tcp_port' to
reflect the usage and to get new defaults
o Return proper data type
Tested heurisitic vs. static on many DICOM captures
Please also include in 2.6 branch if possible.
Change-Id: I0aa42b91e4f55a6d9fc834657710a6a92c8dadef
commit 1edafb048486d3dd3533f9bf79cc5ccc33f1f7c1
Author: David Aggeler <[email protected]>
Date: Sun May 6 17:33:51 2018 +0200
packet-dcm.c:
Updated according to review comments
==
- Fixed initial COL_INFO for associations. It used to 'append' instead of
'set'.
- Changed initial length check from tvb_reported_length() to
tvb_captured_length()
- Heuristic Dissection:
o Modified registration, so it can be clearly identified in the
Enable/Disable Protocols dialog
:...skipping...
commit 605c694d8cc2dc8b4d6b55c7be00d8754d38594b (HEAD -> dicom-heuristic)
Author: David Aggeler <[email protected]>
Date: Mon Jun 11 09:16:22 2018 +0200
packet-dcm.c:
Updated according to review comments
==
- Fixed initial COL_INFO for associations. It used to 'append' instead of
'set'.
- Changed initial length check from tvb_reported_length() to
tvb_captured_length()
- Heuristic Dissection:
o Modified registration, so it can be clearly identified in the
Enable/Disable Protocols dialog
o Enabled by default and
o Renamed heuristic protocol from 'dicom_tcp' to 'dicom_any_tcp_port' to
reflect the usage and to get new defaults
o Return proper data type
Tested heurisitic vs. static on many DICOM captures
Please also include in 2.6 branch if possible.
Change-Id: I0aa42b91e4f55a6d9fc834657710a6a92c8dadef
commit 1edafb048486d3dd3533f9bf79cc5ccc33f1f7c1
Author: David Aggeler <[email protected]>
Date: Sun May 6 17:33:51 2018 +0200
packet-dcm.c:
Updated according to review comments
==
- Fixed initial COL_INFO for associations. It used to 'append' instead of
'set'.
- Changed initial length check from tvb_reported_length() to
tvb_captured_length()
- Heuristic Dissection:
o Modified registration, so it can be clearly identified in the
Enable/Disable Protocols dialog
o Enabled by default and
o Renamed heuristic protocol from 'dicom_tcp' to 'dicom_any_tcp_port' to
reflect the usage and to get new defaults
o Return proper data type
Tested heurisitic vs. static on many DICOM captures
Please also include in 2.6 branch if possible.
Change-Id: I0aa42b91e4f55a6d9fc834657710a6a92c8dadef
commit 5cdff2610799c8f02f671d1aa7d4ec481d9139be (origin/master, origin/HEAD,
master)
Author: Jakub Zawadzki <[email protected]>
Date: Fri May 4 20:38:19 2018 +0200
:
$ git push --progress "origin" HEAD:refs/publish/master/dicom-heuristic
Counting objects: 3532, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (1128/1128), done.
Writing objects: 100% (3532/3532), 1.82 MiB | 1.72 MiB/s, done.
Total 3532 (delta 2901), reused 3005 (delta 2396)
remote: Resolving deltas: 100% (2901/2901)
remote: Processing changes: refs: 1, done
To ssh://code.wireshark.org:29418/wireshark
! [remote rejected] HEAD -> refs/publish/master/dicom-heuristic
(duplicate request)
error: failed to push some refs to
'ssh://[email protected]:29418/wireshark'___________________________________________________________________________
Sent via: Wireshark-dev mailing list <[email protected]>
Archives: https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:[email protected]?subject=unsubscribe
