On 10/04/18 21:22, Ramsay Jones wrote: > > > On 10/04/18 20:35, Derrick Stolee wrote: >> On 4/10/2018 3:21 PM, Ramsay Jones wrote: >>> >>> On 10/04/18 13:57, Derrick Stolee wrote: >>>> On 4/9/2018 6:08 PM, Junio C Hamano wrote: >>>>> I guess we'd want a final cleaned-up round after all ;-) Thanks. >>>> v8 sent [1]. Thanks. >>> I just tried to 'git am' this series and I could not get it >>> to apply cleanly to current 'master', 'next' or 'pu'. I fixed >>> up a few patches, but just got bored ... ;-) >>> >> >> In my cover letter, I did mention that my patch started here (using 'format-patch --base'): >> >> base-commit: 468165c1d8a442994a825f3684528361727cd8c0 >> >> >> This corresponds to v2.17.0. > > Yep, I forgot to mention that I had already tried that too: > > $ git log --oneline -1 > 468165c1d (HEAD -> master-graph, tag: v2.17.0, origin/maint, maint, build) Git 2.17 > $ git am patches/* > Applying: csum-file: rename hashclose() to finalize_hashfile() > Applying: csum-file: refactor finalize_hashfile() method > Applying: commit-graph: add format document > Applying: graph: add commit graph design document > Applying: commit-graph: create git-commit-graph builtin > Applying: commit-graph: create git-commit-graph builtin > error: patch failed: .gitignore:34 > error: .gitignore: patch does not apply > error: Documentation/git-commit-graph.txt: already exists in index > error: patch failed: Makefile:952 > error: Makefile: patch does not apply > error: patch failed: builtin.h:149 > error: builtin.h: patch does not apply > error: builtin/commit-graph.c: already exists in index > error: patch failed: command-list.txt:34 > error: command-list.txt: patch does not apply > error: patch failed: contrib/completion/git-completion.bash:878 > error: contrib/completion/git-completion.bash: patch does not apply > error: patch failed: git.c:388 > error: git.c: patch does not apply > Patch failed at 0006 commit-graph: create git-commit-graph builtin > Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > $ Ah, OK, it helps if you don't have an edited patch backup file in the patches directory! patches now apply cleanly. sparse is also now clean - thanks! ATB, Ramsay Jones
