Wireshark mailing list archives

Sample command line workflow with git and gerrit


From: Joerg Mayer <jmayer () loplof de>
Date: Wed, 26 Feb 2014 01:06:10 +0100

Hello,

I've just documented the workflow I used to update the NEWS file.
Please let me know what I missed and if you have ideas for improvement.

Thanks
   Jörg

jmayer@egg:~/work/wireshark/git(master)> git branch newsupdate
jmayer@egg:~/work/wireshark/git(master)> git checkout newsupdate
Switched to branch 'newsupdate'
jmayer@egg:~/work/wireshark/git(newsupdate)> rm NEWS
==> In another window: Change NEWS file
jmayer@egg:~/work/wireshark/build/qt-gtk3> make release_notes
Generating /home/jmayer/work/wireshark/git/NEWS
Built target release_notes
==> Back to original window:
jmayer@egg:~/work/wireshark/git(newsupdate)> git status
[...]
#       modified:   NEWS
[...]
jmayer@egg:~/work/wireshark/git(newsupdate)> git commit -a
[newsupdate c159b39] As long as the NEWS file is part of the source distribution it really needs to be updated every 
time the file docbook/release-notes.asciidoc get changed.
 1 file changed, 65 insertions(+), 48 deletions(-)
jmayer@egg:~/work/wireshark/git(newsupdate)> git review
remote: Resolving deltas: 100% (2/2)
remote: Processing changes: new: 1, refs: 1, done    
remote: 
remote: New Changes:
remote:   https://code.wireshark.org/review/398
remote: 
To ssh://jmayer () code wireshark org:29418/wireshark
 * [new branch]      HEAD -> refs/publish/master/newsupdate
jmayer@egg:~/work/wireshark/git(newsupdate)> gerrit review 398,1 --submit --code-review +2
jmayer@egg:~/work/wireshark/git(newsupdate)> git checkout master
Switched to branch 'master'
jmayer@egg:~/work/wireshark/git(master)> git branch -D newsupdate
Deleted branch newsupdate (was c159b39).

Note: The "gerrit" command is actually an alias:
  alias gerrit='ssh jmayer () code wireshark org -p 29418 gerrit'


-- 
Joerg Mayer                                           <jmayer () loplof de>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

Current thread: