On 08/21/14 13:38, Thomas Wiens wrote:
I've got gerrit review running, and commited the files via git. But "git review" failed. Any suggestions?That's what I've done, after I have added the files to git: Thomas@VORTEX /c/Development/wireshark (s7comm) $ git status On branch s7comm Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: epan/CMakeLists.txt modified: epan/dissectors/Makefile.common new file: epan/dissectors/packet-s7comm.c new file: epan/dissectors/packet-s7comm.h new file: epan/dissectors/packet-s7comm_szl_ids.c new file: epan/dissectors/packet-s7comm_szl_ids.h Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: config.nmake Thomas@VORTEX /c/Development/wireshark (s7comm) $ git commit [s7comm f91e54e] s7comm: Add dissector for S7 Communication 6 files changed, 7176 insertions(+) create mode 100644 epan/dissectors/packet-s7comm.c create mode 100644 epan/dissectors/packet-s7comm.h create mode 100644 epan/dissectors/packet-s7comm_szl_ids.c create mode 100644 epan/dissectors/packet-s7comm_szl_ids.h Thomas@VORTEX /c/Development/wireshark (s7comm) $ git review Errors running git rebase -p -i remotes/origin/master Cannot rebase: You have unstaged changes. Please commit or stash them.
What does "git status" say at this point? ___________________________________________________________________________ Sent via: Wireshark-dev mailing list <[email protected]> Archives: http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:[email protected]?subject=unsubscribe
