https://bugzilla.wikimedia.org/show_bug.cgi?id=57399
--- Comment #7 from Bartosz Dziewoński <[email protected]> --- (In reply to comment #6) > (1) Does this happen only if you work on repository initially cloned > in the (default) way that "origin" points to the proper repository > and you have no "gerrit" remote? Sort of yes, see below. > (2) does running "git-review -s" on the repository before you make > any changes help? No, it is run automatically on first `git review` if you don't run it yourself. (Internal implemention might differ, but that's the general result.) Basically the issue is that the user will have two remotes, 'origin' and 'gerrit', which will point to the same place (but possibly with different URLs, 'gerrit' will always be ssh://, while 'origin' can be git:, https:, whatever). Running `git review [whatever]` will always use the 'gerrit' remote for fetching and pushing changes, while `git pull` (no arguments) will pull from 'origin'. If: * the user's local copy of 'origin/master' contains commits newer than his copy of 'gerrit/master' (which is likely, since `git pull` only updates origin/master) * the user rebases some patch on master (==origin/master) Then `git review` will see some commits in current branch being pushed that are not in the 'gerrit/master' branch, and will assume they are new commits the user wants to push for review. When actually pushed, gerrit itself will figure it out and do the right thing, but the warning message that appears is very misleading, long (listing all of the commits) and scary. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
