githelper.git/ githelper.pike

2010-10-02

2010-10-02 15:07:10 by Marcus Comstedt <marcus@mc.pp.se>

• 12fbdc762b13f2e65f106196651820c6b701093e (3 lines) (+2/-1) ^{[ Show | Annotate ]}
  Branch: master

Make sure that git diff understands that .gitattributes is a pathname.

366:    // because that could mean the committed stuff ends up with different    // attributes than they have right now...    -  if (sizeof(run_git("diff", "--name-only", ".gitattributes"))) { +  if (sizeof(run_git("diff", "--name-only", "--", ".gitattributes"))) {    write("You have unstaged changes to .gitattributes.\n"    "Please add or stash them before commit.\n");    return 1;