"Philip Oakley" <philipoakley@xxxxxxx> writes: > From: "Philip Oakley" <philipoakley@xxxxxxx> >> From: "Junio C Hamano" <gitster@xxxxxxxxx>, Saturday, December 14, >> 2013 7:39 PM >>> "Philip Oakley" <philipoakley@xxxxxxx> writes: >>> >>>> Would this be a good use of the >>>> * Magic pathspecs like ":(icase) >>>> that was recently released (v1.8.5 2Dec13) so that the merge >>>> stages >>>> can be named. >>> >>> Because the pathspec mechahism is for you to tell an operation that >>> works on a collection of paths (e.g. "all the paths in the HEAD", >>> "all the paths at stage #1 in the index") to narrow the set it >>> operates on down to only those that match, I do not think it is a >>> good match at all to what you are trying to do. >>> >> >> My point was that the ":1:" syntax already was a "path at stage #1 >> in the index" indicator, and that it would be good to have a >> memorable name for the :1:2:3: stages as per Antoine's query. > > Could someone point me at where is this syntax decoded? sha1_name.c (anything that turns name to object name goes there, I think). Look for this comment: /* * sha1:path --> object name of path in ent sha1 * :path -> object name of absolute path in index * :./path -> object name of path relative to cwd in index * :[0-3]:path -> object name of path in index at stage * :/foo -> recent commit matching foo */ I do not think adding ":ours:path" as a synonym to ":2:path" adds enough value to make it worthwhilte to worry about breaking the expectation of those who thought "ours:path/name" will be something they could track if they wanted to. > My initial hunt around the code base didn't find the relevant location. > >> >> It maybe that my referring to it as a 'magic pathspec' was a >> mistake, but the difficulty of remembering which number is >> ours:theirs:base still stands. >> >> (for general info; the :<stage>: format is defined in 'git revision >> (7)' as the last method for Specifying Revisions) >> >> Philip >> -- > Philip -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html