aboutsummaryrefslogtreecommitdiff
path: root/test-sha1.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-20 13:48:39 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-21 01:15:33 -0700
commitebdc94f3bec7ec54babb21b1d785af0cd75b21e6 (patch)
tree777b3578254e6881a1fa45f1fc0e08283bf3288b /test-sha1.sh
parentddd02b70f0d80fc3cac6b2f2c42005560d572413 (diff)
downloadgit-ebdc94f3bec7ec54babb21b1d785af0cd75b21e6.tar.gz
git-ebdc94f3bec7ec54babb21b1d785af0cd75b21e6.tar.xz
revision: --ancestry-path
"rev-list A..H" computes the set of commits that are ancestors of H, but excludes the ones that are ancestors of A. This is useful to see what happened to the history leading to H since A, in the sense that "what does H have that did not exist in A" (e.g. when you have a choice to update to H from A). x---x---A---B---C <-- topic / \ x---x---x---o---o---o---o---M---D---E---F---G <-- dev / \ x---o---o---o---o---o---o---o---o---o---o---o---N---H <-- master The result in the above example would be the commits marked with caps letters (except for A itself, of course), and the ones marked with 'o'. When you want to find out what commits in H are contaminated with the bug introduced by A and need fixing, however, you might want to view only the subset of "A..B" that are actually descendants of A, i.e. excluding the ones marked with 'o'. Introduce a new option --ancestry-path to compute this set with "rev-list --ancestry-path A..B". Note that in practice, you would build a fix immediately on top of A and "git branch --contains A" will give the names of branches that you would need to merge the fix into (i.e. topic, dev and master), so this may not be worth paying the extra cost of postprocessing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-sha1.sh')
0 files changed, 0 insertions, 0 deletions