| commit | ffc2b483dee43c2687088d4c73d7532fda855050 | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 17 Jan 2014 20:00:20 +0000 (17 20:00 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Jan 2014 20:03:32 +0000 (17 12:03 -0800) | ||
| tree | c73f6cd468c475a40ff4e10e0cfb2bedfcc35e3e | treesnapshot (tar.gz zip) |
| parent | bb3f45838b859c8b17a53a24579a304333868cc8 | commitdiff |
pull: suppress error when no remoteref is found
Commit 48059e4 (pull: use merge-base --fork-point when appropriate,
2013-12-08) incorrectly assumes that get_remote_merge_branch will either
yield a non-empty string or return an error, but there are circumstances
where it will yield an empty string.
The previous code then invoked git-rev-list with no arguments, which
results in an error suppressed by redirecting stderr to /dev/null. Now
we invoke git-merge-base with an empty branch name, which also results
in an error. Suppress this in the same way.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit 48059e4 (pull: use merge-base --fork-point when appropriate,
2013-12-08) incorrectly assumes that get_remote_merge_branch will either
yield a non-empty string or return an error, but there are circumstances
where it will yield an empty string.
The previous code then invoked git-rev-list with no arguments, which
results in an error suppressed by redirecting stderr to /dev/null. Now
we invoke git-merge-base with an empty branch name, which also results
in an error. Suppress this in the same way.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-pull.sh | diffblobblamehistory |