Re: [patch] Fix a corner case in git update-index --index-info
From: Thomas Jarosch <hidden>
Date: 2016-06-15 22:45:46
On Saturday, 13. December 2008 20:29:12 you wrote:
If you are doing a filter-branch and the commits near the beginning of the history did not have any path you are interested in, I do not think you would want to even create corresponding commits for them that record an empty tree to begin with, so I do not necessarily agree with the above command line. The mv would fail due to absense of index.new file, and you can take it as a sign that you can skip that commit.
True. I killed the empty commit later using rebase -i. Great tool :-)
Outside the context of your command line above, I am slightly more sympathetic than neutral to the argument that "update-index --index-info" (and "update-index --stdin", which I suspect would have the same issue, but I did not check) should create an output file if one did not exist. You should note however that such a change would rob from you a way to detect that you did not feed anything to the command by checking the lack of the output. Such a change would break people's existing scripts that relied on the existing behaviour; one example is that the above "The mv would fail...and you can" would be made impossible.
That is also true. OTOH there would be no way to create an empty tree,
f.e. if you do positive filtering like --subdirectory-filter
just with multiple subdirs:
git filter-branch --tag-name-filter cat --index-filter \
'git ls-files -s |grep -P "\t(DIR1|DIR2)" \
|GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info &&
mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' -- --all
Later on I removed all empty commits in a second run.
quoted
+ if (!found_something) + active_cache_changed = 1; + strbuf_release(&buf); strbuf_release(&uq); }I think this implementation is conceptually wrong, even if we assume it is the right thing to always create a new file. The --index-info mode may well be fed with the same information as it already records, in which case active_cache_changed shouldn't be toggled, and if it is fed something different from what is recorded, active_cache_changed should be marked as changed, and that decision should be left to the add_cache_entry() that is called from add_cacheinfo(). What you did is to make it _always_ write the new index out, even if we started with an existing index, and there was no change, or even if we started with missing index, and there was no input. You only wanted the latter but you did both.
The idea was to toggle the active_cache_changed variable only if we didn't get a single line of input from stdin. If you feed back the same index information f.e. via "git ls-tree -s", the active_cache_changed=1 code shouldn't be executed. Though I didn't explicitly test this case, so I guess you are right.
But again, this would break people who have been relying on the existing behaviour that no resulting file, when GIT_INDEX_FILE points at a nonexistent file, signals no operation.
See my remark about "positive list" filtering above.
I think it is a bad idea to do this in -rc period, even if we were to change the semantics.
Yes, this is something one doesn't want in a -rc :-) Thanks for your implementation. btw: I sent a small documentation update to the list and forgot to add you to the CC: list. The subject line was "[patch] documentation: Explain how to free up space after filter-branch" Cheers, Thomas