Today I wanted to update my copy, so I went to the directory with FG source and issued:
- Code: Select all
compile/fg_next/flightgear$ git status
On branch next
Your branch is up-to-date with 'origin/next'.
nothing to commit, working directory clean
however, just to be sure, I then issued:
- Code: Select all
compile/fg_next/flightgear$ git pull
remote: Enumerating objects: 36, done.
remote: Counting objects: 100% (36/36), done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 23 (delta 19), reused 0 (delta 0)
Unpacking objects: 100% (23/23), done.
From https://git.code.sf.net/p/flightgear/flightgear
96b9cfa..4bf88a0 next -> origin/next
Updating 96b9cfa..4bf88a0
Fast-forward
src/GUI/MapWidget.cxx | 2 ++
src/GUI/property_list.cxx | 2 +-
src/Instrumentation/HUD/HUD_gauge.cxx | 21 +++++++++++----------
test_suite/unit_tests/Navaids/test_routeManager.cxx | 30 ++++++++++++++++++++++++++++++
test_suite/unit_tests/Navaids/test_routeManager.hxx | 2 ++
5 files changed, 46 insertions(+), 11 deletions(-)
So, obviously, there were commits ahead of my copy, however 'git status' claimed "Your branch is up-to-date with 'origin/next'". What gives? Is this the expected behaviour of 'git status'?