git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Updated to v2.14.2 on macOS; git add --patch broken

From
Toni Uebernickel <tuebernickel@gmail.com>
Date
Sep 28, 2017, 05:03 UTC
Message-ID
<21387D23-F581-4179-969E-823FEF82C405@gmail.com>
In-Reply-To
<20170927195310.GF19555@aiede.mtv.corp.google.com>
Hi Jonathan,

my configuration reads as follows, I only removed private tokens content. I will try to get more details on which version exactly breaks the command.

Kind Regards, Toni

core.excludesfile=/usr/local/etc/gitignore core.whitespace=trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,tabwidth=2 core.autocrlf=input core.ignorecase=true gpg.program=gpg2 credential.helper=osxkeychain diff.patience=true diff.algorithm=patience diff.compactionheuristic=true notes.displayref=refs/notes/* advice.detachedhead=false pull.rebase=preserve push.default=upstream merge.ff=false merge.summary=true merge.log=false rerere.enabled=true rebase.autosquash=true rebase.autostash=true stash.showpatch=true branch.autosetuprebase=always color.ui=always color.branch.current=yellow reverse color.branch.local=yellow color.branch.remote=green color.diff.meta=yellow color.diff.func=cyan bold color.diff.frag=magenta color.diff.old=red color.diff.new=green color.diff.whitespace=red reverse color.status.added=green color.status.changed=yellow color.status.untracked=cyan color.status.nobranch=red pretty.changelog=format:* %h %s pretty.public-changelog=format:* %s pretty.pretty-history=format:%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset gitflow.multi-hotfix=true gitflow.prefix.feature=feature/ gitflow.prefix.release=release/ gitflow.prefix.bugfix=bugfix/ gitflow.prefix.hotfix=hotfix/ gitflow.prefix.support=support/ gitflow.prefix.versiontag=v gitflow.feature.finish.rebase=true gitflow.feature.finish.no-ff=true gitflow.feature.finish.keepremote=true gitflow.feature.finish.keeplocal=false gitflow.release.finish.keepremote=true gitflow.release.finish.keeplocal=false gitflow.hotfix.finish.keepremote=true gitflow.hotfix.finish.keeplocal=false alias.st=status alias.co=checkout alias.di=diff alias.ci=commit alias.ci-rm=!git commit && git notes --ref=redmine add alias.ci-gh=!git commit && git notes --ref=github.issues add alias.ci-n=!git commit && git notes add alias.amend=commit --amend alias.update=add -u alias.up-head=!f() { git diff-tree --no-commit-id --name-only --diff-filter=ACMR -r HEAD; }; git add -p `f` alias.staged=diff --cached alias.ls-staged=diff-index --cached --name-only HEAD alias.di-staged=!git diff-index --cached --name-only --diff-filter=ACMR HEAD | xargs git di alias.co-staged=!git diff-index --cached --name-only --diff-filter=ACMR HEAD | xargs git co alias.up-staged=!f() { git ls-staged; }; git add -p `f` alias.coding-standards=!php-cs-fixer fix alias.cs=!f() { git diff-tree --no-commit-id --name-only --diff-filter=ACMR -r "$1" | xargs -n1 git coding-standards; }; f alias.cs-staged=!git diff-index --cached --name-only --diff-filter=ACMR HEAD | xargs -n1 git coding-standards alias.cs-head=!git diff-tree --no-commit-id --name-only --diff-filter=ACMR -r HEAD | xargs -n1 git coding-standards alias.cs-tree=!f() { git ls-tree -r --name-only HEAD "$1" | xargs -n1 git coding-standards; }; f alias.ph=log --graph --pretty=pretty-history --abbrev-commit --date=relative alias.cl=log --pretty=changelog --no-merges --cherry --abbrev-commit --date-order alias.sl=log --oneline --reverse --no-merges --stat alias.rv=remote -v alias.fa=fetch --all -v alias.ff=pull --ff-only alias.wu=branch -a --no-merged alias.latest-version=!git tag --sort=v:refname | tail -n1 alias.pt=push --tags origin master:master develop:develop git-up.fetch.prune=true git-up.fetch.all=true filter.lfs.clean=git-lfs clean %f filter.lfs.smudge=git-lfs smudge %f filter.lfs.required=true user.name=Toni Uebernickel user.email=tuebernickel@gmail.com user.signingkey=F6035C7A core.editor=mate -w -l 1 commit.gpgsign=true github.user=havvg github.token=PRIVATE_CREDENTIALS_REMOVED travis.user=tuebernickel@gmail.com travis.token=PRIVATE_CREDENTIALS_REMOVED alias.review=!f() { git ph --author="$1" ; }; f alias.rf=!f() { git flow feature track "$1" && git co feature/"$1" && git ff && git flow finish; }; f alias.upstream=!git merge --ff-only upstream/`git branch --list --no-color | grep -e '^\*' | cut -d" " -f2 core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true core.ignorecase=true core.precomposeunicode=true remote.origin.url=git@gitlab.tarifhaus.ag:tarifhaus/thengine.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* branch.develop.remote=origin branch.develop.merge=refs/heads/develop branch.develop.rebase=true commit.gpgsign=false branch.master.remote=origin branch.master.merge=refs/heads/master branch.master.rebase=true gitflow.branch.master=master gitflow.branch.develop=develop gitflow.path.hooks=/Users/toni.uebernickel/Development/Tarifhaus/repositories/thengine/.git/hooks user.email=toni.uebernickel@tarifhaus.ag gitflow.branch.feature/ITTPL-36-coupon-token-email-limit.base=develop gitflow.branch.feature/ITTPL-49-command-locking.base=develop gitflow.branch.release/2.5.0.base=develop gitflow.branch.feature/ITTHE-243-landingpage-content-tags.base=develop gitflow.branch.release/2.6.0.base=develop gitflow.branch.feature/ITTHE-246-json-web-token.base=develop gitflow.branch.release/2.7.0.base=develop gitflow.branch.feature/ITTHE-249-post-request-daten.base=develop gitflow.branch.feature/ITTHE-248-users-api.base=develop gitflow.branch.release/2.8.0.base=develop gitflow.branch.feature/ITTPL-92-url-shortener.base=develop gitflow.branch.release/2.9.0.base=develop gitflow.branch.feature/ITTHE-255-basic-orders-api.base=develop gitflow.branch.feature/ITTHE-260-migrate-databases-helper.base=develop gitflow.branch.feature/ITTHE-257-signup.base=develop gitflow.branch.feature/ITTHE-256-api-profile.base=develop gitflow.branch.feature/ITTHE-267-convert-to-testdox.base=develop gitflow.branch.release/2.10.0.base=develop gitflow.branch.feature/ITTPL-137-besser-mobile-portal.base=develop gitflow.branch.feature/ITTHE-251-HTTP-500-api-problem.base=develop gitflow.branch.feature/ITTHE-272-message-queue.base=develop gitflow.branch.feature/ITTBO-7-einfache-faq-verwaltung.base=hotfix/2.9.2 gitflow.branch.feature/Tarifporfolio-V3.base=master gitflow.branch.release/2.11.0.base=develop gitflow.branch.release/2.12.0.base=develop branch.support/ITTHE-262.remote=origin branch.support/ITTHE-262.merge=refs/heads/support/ITTHE-262 branch.support/ITTHE-262.rebase=true gitflow.branch.feature/ITTHE-277-change-password.base=develop gitflow.branch.feature/ITTHE-280-TEF-MyPay.base=develop gitflow.branch.feature/ITTHE-292-msisdn-on-contract-activation.base=release/2.14.0 gitflow.branch.feature/ITTHE-280-mypay-vouchercode-transactions.base=release/2.14.0 branch.feature/ITTHE-280-mypay-vouchercode-transactions.remote=origin branch.feature/ITTHE-280-mypay-vouchercode-transactions.merge=refs/heads/feature/ITTHE-280-mypay-vouchercode-transactions branch.feature/ITTHE-280-mypay-vouchercode-transactions.rebase=true gitflow.branch.feature/ITTHE-293-translate-security-error-messages.base=develop gitflow.branch.feature/ITTHE-295-combined-contract-endpoint.base=release/2.14.0 gitflow.branch.feature/ITTHE-294-simcard-activation.base=release/2.14.0 branch.support/json-rpc-form-type.remote=origin branch.support/json-rpc-form-type.merge=refs/heads/support/json-rpc-form-type branch.support/json-rpc-form-type.rebase=true gitflow.branch.feature/ITTHE-310-user-profile-for-existing-users.base=develop gitflow.branch.feature/ITTHE-312-refactor-obtaining-vouchers.base=develop gitflow.branch.feature/ITTHE-298-vouchers-for-user-subset.base=develop gitflow.branch.feature/ITTHE-313-send-signup-message.base=develop gitflow.branch.release/2.16.0.base=develop gitflow.branch.release/2.17.0.base=develop gitflow.branch.feature/ITTHE-315-explicit-persist-attribute-value.base=develop gitflow.branch.release/2.18.0.base=develop gitflow.branch.feature/ITTPL-350-bcc-club-email-to-lbe.base=develop gitflow.branch.feature/ITTHE-321-promotion-voucher-on-contract-basis.base=develop gitflow.branch.feature/ITTHE-325-lock-voucher-when-obtaining.base=develop gitflow.branch.release/2.19.0.base=develop gitflow.branch.hotfix/2.19.1.base=master gitflow.branch.feature/ITTHE-339-api-access-control.base=develop gitflow.branch.release/2.20.0.base=develop gitflow.branch.feature/ITTHE-334-promotion-for-all-customers.base=develop gitflow.branch.feature/ITTHE-331-behat-context-api-problem.base=develop gitflow.branch.feature/ITTHE-336-canonical-user-email-address.base=develop gitflow.branch.feature/ITTHE-138-address-validation-setup-wrapper.base=develop lfs.https://gitlab.tarifhaus.ag/tarifhaus/thengine.git/info/lfs.locksverify=false gitflow.branch.feature/ITTHE-351-behat-assert-response-content.base=develop gitflow.branch.release/2.21.0.base=develop gitflow.branch.feature/ITTHE-355-refactor-chat-api.base=develop gitflow.branch.feature/ITADM-48-feature-deployments.base=develop gitflow.branch.release/2.22.0.base=develop gitflow.branch.feature/ITTHE-360-media-service.base=develop branch.feature/ITTHE-360-media-service.remote=origin branch.feature/ITTHE-360-media-service.merge=refs/heads/feature/ITTHE-360-media-service branch.feature/ITTHE-360-media-service.rebase=true gitflow.branch.feature/tarifhaus-club-support.base=develop gitflow.branch.feature/ITTHE-370-open-promotions-not-listed.base=develop gitflow.branch.feature/ITTHE-371-support-registration-vouchers.base=develop gitflow.branch.release/2.23.0.base=develop gitflow.branch.feature/ITTHE-375-support-promotion-participants.base=develop gitflow.branch.feature/ITTHE-288-aboalarm-bank-account-check.base=develop gitflow.branch.release/2.25.0.base=develop branch.feature/ITTHE-384-products-and-attributes-new-portal-strategy.remote=origin branch.feature/ITTHE-384-products-and-attributes-new-portal-strategy.merge=refs/heads/feature/ITTHE-384-products-and-attributes-new-portal-strategy branch.feature/ITTHE-384-products-and-attributes-new-portal-strategy.rebase=true gitflow.branch.feature/ITTHE-388-json-rpc.base=develop gitflow.branch.feature/ITTHE-382-anonymise-order-notification.base=develop branch.feature/ITTHE-388-json-rpc.remote=origin branch.feature/ITTHE-388-json-rpc.merge=refs/heads/feature/ITTHE-388-json-rpc branch.feature/ITTHE-388-json-rpc.rebase=true gitflow.branch.feature/ITTHE-372-vouchers-on-monthly-basis.base=develop branch.feature/ITTHE-385-timeline.remote=origin branch.feature/ITTHE-385-timeline.merge=refs/heads/feature/ITTHE-385-timeline branch.feature/ITTHE-385-timeline.rebase=true gitflow.branch.release/2.26.0.base=develop branch.release/2.26.0.remote=origin branch.release/2.26.0.merge=refs/heads/release/2.26.0 branch.release/2.26.0.rebase=true branch.feature/ITTHE-386-member-connections.remote=origin branch.feature/ITTHE-386-member-connections.merge=refs/heads/feature/ITTHE-386-member-connections branch.feature/ITTHE-386-member-connections.rebase=true

-- Toni Uebernickel

tuebernickel@gmail.com - https://keybase.io/havvg https://github.com/havvg - https://www.xing.com/profile/Toni_Uebernickel

Show 30 quoted lines
> On 27. Sep 2017, at 21:53, Jonathan Nieder <jrnieder@gmail.com> wrote:
> 
> Jonathan Nieder wrote:
>> Jeff King wrote:
> 
>>> There aren't a lot of changes to the script between v2.13.2 and v2.14.2.
>>> The most plausible culprit is d5addcf522 (add--interactive: handle EOF
>>> in prompt_yesno, 2017-06-21), but I'm scratching my head over how that
>>> could cause what you're seeing.
>>> 
>>> Are you able to build Git from source and bisect the problem? It would
>>> help to know which commit introduced the problem.
>> 
>> How about this change?
>> 
>> commit 136c8c8b8fa39f1315713248473dececf20f8fe7
>> Author: Jeff King <peff@peff.net>
>> Date:   Thu Jul 13 11:07:03 2017 -0400
>> 
>>     color: check color.ui in git_default_config()
> 
> Uh, I think I was thinking of another thread when I wrote this.  Sorry
> for the nonsense.
> 
>> Toni, what is the output of "git config -l"?
> 
> I'm still curious about this.
> 
> Thanks,
> Jonathan
Previous: Jonathan NiederNext: Jeff King
Message 7 of 42 in “Updated to v2.14.2 on macOS; git add --patch broken”
  1. Toni UebernickelSep 27, 2017
  2. Jeff KingSep 27, 2017
  3. Toni UebernickelSep 27, 2017
  4. Jeff KingSep 27, 2017
  5. Jonathan NiederSep 27, 2017
  6. Jonathan NiederSep 27, 2017
  7. Toni UebernickelSep 28, 2017
  8. Jeff KingSep 28, 2017
  9. Toni UebernickelSep 28, 2017
  10. Jonathan NiederOct 2, 2017
  11. Junio C HamanoOct 3, 2017
  12. Junio C HamanoOct 3, 2017
  13. Junio C HamanoOct 3, 2017
  14. Jeff KingOct 3, 2017
  15. Junio C HamanoOct 3, 2017
  16. Jeff KingOct 3, 2017
  17. Junio C HamanoOct 3, 2017
  18. Jeff KingOct 3, 2017
  19. Junio C HamanoOct 3, 2017
  20. Jeff KingOct 3, 2017
  21. Tsvi MostoviczOct 3, 2017
  22. Junio C HamanoOct 3, 2017
  23. Jeff KingOct 3, 2017
  24. 01/12 test-terminal: set TERM=vt100Jeff King, Oct 3, 2017
  25. 02/12 t4015: prefer --color to -c color.diff=alwaysJeff King, Oct 3, 2017
  26. 03/12 t4015: use --color with --color-movedJeff King, Oct 3, 2017
  27. 04/12 t3701: use test-terminal to collect color outputJeff King, Oct 3, 2017
  28. 05/12 t7508: use test_terminal for color outputJeff King, Oct 3, 2017
  29. 06/12 t7502: use diff.noprefix for --verbose testJeff King, Oct 3, 2017
  30. 07/12 t6006: drop "always" color config testsJeff King, Oct 3, 2017
  31. 08/12 t3203: drop "always" color testJeff King, Oct 3, 2017
  32. 09/12 t7301: use test_terminal to check colorJeff King, Oct 3, 2017
  33. 10/12 t3205: use --color instead of color.branch=alwaysJeff King, Oct 3, 2017
  34. 11/12 provide --color option for all ref-filter usersJeff King, Oct 3, 2017
  35. 12/12 color: make "always" the same as "auto" in configJeff King, Oct 3, 2017
  36. Junio C HamanoOct 4, 2017
  37. Jeff KingOct 5, 2017
  38. Jan PrachařOct 20, 2017
  39. Jeff KingOct 3, 2017
  40. 0/2 fixing "add -p" regressionJunio C Hamano, Oct 3, 2017
  41. 1/2 Revert "color: check color.ui in git_default_config()"Junio C Hamano, Oct 3, 2017
  42. 2/2 colors: git_default_config() does not read color.uiJunio C Hamano, Oct 3, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.