| commit | 69310a34cb6dcca32b08cf3ea9e91ab19354a874 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 22 Dec 2005 20:39:39 +0000 (22 12:39 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 22 Dec 2005 20:39:39 +0000 (22 12:39 -0800) | ||
| tree | ec479739306acda64f72421ac37c2ef79c8f880d | treesnapshot (tar.gz zip) |
| parent | 7246ed438c541650c2cd50e4e98b43226f60da0c | commitdiff |
send-pack: reword non-fast-forward error message.
Wnen refusing to push a head, we said cryptic "remote 'branch'
object X does not exist on local" or "remote ref 'branch' is not
a strict subset of local ref 'branch'". That was gittish.
Since the most likely reason this happens is because the pushed
head was not up-to-date, clarify the error message to say that
straight, and suggest pulling first.
First noticed by Johannes and seconded by Andreas.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Wnen refusing to push a head, we said cryptic "remote 'branch'
object X does not exist on local" or "remote ref 'branch' is not
a strict subset of local ref 'branch'". That was gittish.
Since the most likely reason this happens is because the pushed
head was not up-to-date, clarify the error message to say that
straight, and suggest pulling first.
First noticed by Johannes and seconded by Andreas.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| send-pack.c | diffblobblamehistory |