Source Mage code commit list

[Jeremy Blosser <jblosser-smgl AT firinn.org>]

Note, this mail is about some advanced git stuff, if you don't want to care
about it, feel free to not read it.  :-)

On May 18, scm AT mail.sourcemage.org [scm AT mail.sourcemage.org] wrote:
> GIT changes to test grimoire by  <>:
> 
>  gnome2-apps/gnomesword/DETAILS                     |    4 ++--
>  gnome2-apps/gnomesword/HISTORY                     |    3 +++
>  gnome2-apps/gnomesword/gnomesword-2.1.7.tar.gz.sig |binary
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> New commits:
> commit ecf4c8db0af1d5c28098eea2f07e1417f32cf648
> Merge: 9aa8aa3... 146cddb...
> Author: Robin Cook <rcook AT wyrms.net>
> Commit: Robin Cook <rcook AT wyrms.net>
> 
>     Merge branch 'origin'


Some more info on what's going on here: when you do a 'pull', git does a
merge of the new stuff from upstream into your current branch, with an auto
commit at the end.  This auto commit produces the above log message.  It
also gets sent along when you do a 'push'.

Several commands (like git-show) won't include info from these 'merge
commits' unless you explicitly ask for them, via -m.  However, they're
still in the history.

I've had recommendations to use 'git-rebase' instead of 'git-pull' to get
upstream updates.  rebase works more by just replaying commits instead of
trying to do a merge, and there's no commit at the end.  Both would leave
you with manual clean up to do if a conflict happened during the
merge/rebase.  I'm not entirely clear if rebase requires a clean working
copy or not, I don't think it does since it does detect conflicts.

Anyway, if any of you who are getting into git would like to try this out
some and let us know if it seems better or worse than pulling, please feel
free.  You'd basically replace:

git checkout master; git fetch; git pull origin

with:

git checkout master; git fetch; git rebase origin


PS: The bug we found is that 'git-show <commitid>' will show info on that
commit even if it was a merge commit, since you asked for it explicitly.
However, 'git-show --pretty=full <commitid>', which is what I use in the
mail script to get the committer info, will not show merge commits unless
you specifically use -m.  This was reportedly fixed post-1.3.3 before we
asked about it, so 1.3.4 should have it.  For now the mail script just
uses -m.

Attachment: pgp9X_6qCAHga.pgp
Description: PGP signature