diff options
author | Robert Shearman <rob@codeweavers.com> | 2006-07-27 09:32:25 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-31 07:15:59 (GMT) |
commit | 83c31614ceae2612b7cdba40e6401716fe854cd2 (patch) | |
tree | e45d87ca6b9132b4e81075542dc581172524a972 /builtin-init-db.c | |
parent | b63fafdfd844c2037fba53b9944431c1378b4135 (diff) | |
download | git-83c31614ceae2612b7cdba40e6401716fe854cd2.zip git-83c31614ceae2612b7cdba40e6401716fe854cd2.tar.gz git-83c31614ceae2612b7cdba40e6401716fe854cd2.tar.bz2 |
rebase: Fix the detection of fast-forwarding of the current branch to upstream.
Previously, a rebasing operation with on a branch that is just tracking
an upstream branch would output a confusing "Nothing to do" due to no
patches being given to git-am.
The test brings the behaviour back into line with that of just before
e646c9c8c0aa995eac284ea0a2117add19c4461c.
Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-init-db.c')
0 files changed, 0 insertions, 0 deletions