githelper.git/ githelper.pike

2010-10-04

2010-10-04 22:45:33 by Marcus Comstedt <marcus@mc.pp.se>

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

Relax check on removal of foreign_ident

The foreign_ident attribute is now allowed to be removed from a file
which has already been been deprived of its expanded ident string.
This situation can happen when amending rebased commits.

422:    foreach(removed_fi, string path) {    if(has_prefix(path, "/"))    path = path[1..]; -  if (search(files_to_commit, path)<0) { +  if (search(files_to_commit, path)<0 && +  find_expanded_ident(get_file(path, 1))) {    write("Removed foreign_ident from unchanged file %s\n", path);    return 1;    }