[RFC] Order of push/pull file transfers

From: Russell King <rmk@arm.linux.org.uk>
Date: 2005-06-23 20:12:55

I'd like to start a discussion on the ordering of the various git files
being transferred.

Last night, I pulled Linus' kernel tree from k.o, but Linus was in the
middle of pushing an update to it.  The way cogito works, it grabs the
HEAD first, and then rsyncs the objects.

However, this retrieved the updated HEAD, and only some of the objects.
cogito happily tried to merge the result, and failed.  A later pull
and git-fsck-cache confirmed everything was fine _in this instance_.

Therefore, may I suggest the following two changes in the way git

1. a push updates HEAD only after the rsync/upload of all objects is
   complete.  This means that any pull will not try to update to the
   new head with a partial object tree.

2. a pull only tries to fetch objects if HEAD has been updated since
   the last pull.

This gives a pull-er an additional safety margin which ensures that
merges will not be attempted when a simultaneous pull and push occurs
at the same time.

Russell King

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Jun 23 20:33:08 2005

This archive was generated by hypermail 2.1.8 : 2005-06-23 20:33:10 EST