| Issue 359: | "no changes made" when only parent pointer is updated | |
| Back to list |
Sign in to add a comment
|
Affected Version: 2.0.24.2
I'm finding situations where Gerrit rejects changes because "no
changes made", in situations where I believe that I actually need to
upload a change.
Repro steps:
#edit file
git commit -a -m "a"
#edit file
git commit -a -m "B"
repo upload .
git rebase -i goog/master # mark the first change for edit.
git commit --amend -m "A"
git rebase --continue
repo upload . # fails as "no changes made"
At that point A2 (commit A patch set 2) got uploaded properly, but B
is stuck: B1 can't be submitted (depends on A1, which will never get
submitted) and B2 can't be uploaded ("no changes made" compared to B1,
even though it has a different parent).
B2 fails to upload because everything except the parent pointer is
the same. Normally Gerrit allows the tree to be the same, but the
message to be different, but it doesn't permit message and tree to
be identical and have only the parent be different.
This only occurs if you edit the commit message only in a prior
commit in a series and try to upload the rest of the series.
Dec 22, 2009
#1
sop@google.com
Dec 22, 2009
Fixed by change I2c53a4a5b11c2c90967b3ba0ea2452668f3f4723. We now also check the parent pointers, at least one parent pointer has to be different to allow the change to upload, but we issue a warning if no files were modified so the user can try to double check that his intent matches what gerrit saw.
Status:
Fixed
Labels: FixedIn-2.1.1
Oct 21, 2012
(No comment was entered for this change.)
Status:
Released
|
||||||||||
| ► Sign in to add a comment | |||||||||||