Yes, whitespaces and EOF's were the real cause. I've run the autopep8 tool and it solved the issue. Tim, I've managed to build wget2 against the latest master (though I had to change $gnulib_tool and checkout master inside submodule).
2017-09-08 17:51 GMT+03:00 Darshit Shah <darnirml...@gmail.com>: > * Dmitry Selyutin <ghostman...@gmail.com> [170908 16:39]: > > Hi Bruno, > > > > below is the sequence of commands. > > > > # creating a new branch on commit before pushing gnulib-tool > > $ git branch pygnulib-stable ec2d72558 > > > > # checking out branch and rebasing on the latest master changes > > $ git checkout pygnulib-stable > > $ git rebase master > > > > # cherry-picking only commits which touch original implementation > > $ git cherry-pick eb41868f9 6edef0c50 f9364747f d1a39ef33 > > > > # checking out master and merging, trying to push > > $ git checkout master > > $ git merge pygnulib-stable > > $ git push origin master:master > > > > I've attached the log. All I can see is a lot of complaints on > whitespaces > > and EOF. > > Does that just mean that I need to make the code a bit cleaner? > > Or there may be another reason for hook to reject the commit? > > > > 2017-09-07 23:54 GMT+03:00 Bruno Haible <br...@clisp.org>: > > > > > Hi Dmitry, > > > > > > > As for merging into master, I tried to do it, but didn't succeed: git > > > > complains a lot on whitespaces and similar stuff. I suspect it may be > > > > caused by custom git hook. > > > > > > Yes, the custom git hook can emit errors and warnings. The messages > about > > > whitespace are only warnings, as far as I know. The error message(s) > must > > > be different. > > > > > > > Bruno, Paul, could you help me with merging? > > > > > > I might help you better if you show the error message(s) you got - and, > > > obviously, the command sequence you tried. > > > > > > Bruno > > > > > > > > > > > > -- > > With best regards, > > Dmitry Selyutin > > Hi Dmitry, > > I think you forgot to attach the log files. I don't see anything > attached to your mail. Could you please check it once? > > Since I don't know the exact warnings, I can't speak about those. > However, from what I see, gnulib-tool.py has a lot of trailing > whitespaces. That is lines that end with a whitespace character. This is > usually discouraged, and my guess is exactly what the commit hooks are > catching on to. You could try to set your editor to highlight such > spaces or even to delete them on saving a file. Or you could use a regex > like: `s/\s\+$//g` to remove all the trailing whitespaces > > -- > Thanking You, > Darshit Shah > PGP Fingerprint: 7845 120B 07CB D8D6 ECE5 FF2B 2A17 43ED A91A 35B6 > -- With best regards, Dmitry Selyutin
