Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date
- From
ir0s <imirene@gmail.com>
- Date
- Aug 21, 2008, 15:35 UTC
- Message-ID
- <1219332938839-740444.post@n2.nabble.com>
- In-Reply-To
- <7v4p5fnw3i.fsf@gitster.siamese.dyndns.org>
Sorry if you get this twice, oddly my first attempt to send this bounced. Thank you for all the good advice however, none of it seemed to resolve my issue.
Attempting to call: $git push origin mybranch
Results in the same message: Everything up to date =/ I also tried to call $git fetch origin just in case, and doing a pull doesn't return anything (which makes sense, no one pushed anything to the branch -- although I seem to be the only one with this issue.)
Could my branch have somehow diverged from the origin remotebranch?
-- Irene
Junio C Hamano wrote:
Show 28 quoted lines
>
> Daniel Barkalow <barkalow@iabervon.org> writes:
>
>> That is actually to say that fetch should do it (pull calls fetch for
>> that
>> part), and I agree with that, assuming you've actually got that fetch
>> config, of course.
>
> Hmm, traditionally, an explicit refspec on the command line that does not
> store overrides the configured ones that do store, and I've been using it
> as a feature when I run test fetches. If I do not like fetched result, I
> can tell the other guy to fix his history and I do not have to contaminate
> the history my tracking ref points at. IOW, I use my tracking refs not
> just "this is where the guy is", but "this is the last good one I fetched
> from that guy".
>
> I could be persuaded to use reflog (e.g. "git diff his@{1}..his") and
> manual tagging (i.e. "git tag -f last-good-his his") myself, but this is
> "I'd _tolerate_ such a change myself", certainly not "I am happy with that
> change and I'd help you guys advocate it and try convincing others who
> shared my expectations to switch to reglog and manual tagging."
>
> --
> 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
>
> -- View this message in context: http://n2.nabble.com/Local-branch-ahead-of-tracked-remote-branch-but-git-push-claims-everything-up-to-date-tp736663p740444.html Sent from the git mailing list archive at Nabble.com.