diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-06 16:08:06 -0500 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-02-06 16:08:06 -0500 |
commit | 7073e69e382bc8247c28859d8b0eda2612cd6b94 (patch) | |
tree | b4e0cd34461796e03686090a594c9f1ee07d9290 /tree.c | |
parent | Support RFC 2822 date parsing in fast-import. (diff) | |
download | tgif-7073e69e382bc8247c28859d8b0eda2612cd6b94.tar.xz |
Don't do non-fastforward updates in fast-import.
If fast-import is being used to update an existing branch of
a repository, the user may not want to lose commits if another
process updates the same ref at the same time. For example, the
user might be using fast-import to make just one or two commits
against a live branch.
We now perform a fast-forward check during the ref updating process.
If updating a branch would cause commits in that branch to be lost,
we skip over it and display the new SHA1 to standard error.
This new default behavior can be overridden with `--force`, like
git-push and git-fetch.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'tree.c')
0 files changed, 0 insertions, 0 deletions