Revision 0f9b55bff85109e33075ad19eff5cf2f758bc378 authored by Junio C Hamano on 18 April 2009, 04:42:13 UTC, committed by Junio C Hamano on 18 April 2009, 04:42:13 UTC
* jk/cobdoc:
  docs/checkout: clarify what "non-branch" means
  doc/checkout: split checkout and branch creation in synopsis
  doc/checkout: refer to git-branch(1) as appropriate
  doc: refer to tracking configuration as "upstream"
  doc: clarify --no-track option
2 parent s fc917ad + 0808723
Raw File
diff-lib.sh
:

_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*	/ X X \1#	/'
compare_diff_raw () {
    # When heuristics are improved, the score numbers would change.
    # Ignore them while comparing.
    # Also we do not check SHA1 hash generation in this test, which
    # is a job for t0000-basic.sh

    sed -e "$sanitize_diff_raw" <"$1" >.tmp-1
    sed -e "$sanitize_diff_raw" <"$2" >.tmp-2
    test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}

sanitize_diff_raw_z='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*$/ X X \1#/'
compare_diff_raw_z () {
    # When heuristics are improved, the score numbers would change.
    # Ignore them while comparing.
    # Also we do not check SHA1 hash generation in this test, which
    # is a job for t0000-basic.sh

    perl -pe 'y/\000/\012/' <"$1" | sed -e "$sanitize_diff_raw_z" >.tmp-1
    perl -pe 'y/\000/\012/' <"$2" | sed -e "$sanitize_diff_raw_z" >.tmp-2
    test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}

compare_diff_patch () {
    # When heuristics are improved, the score numbers would change.
    # Ignore them while comparing.
    sed -e '
	/^[dis]*imilarity index [0-9]*%$/d
	/^index [0-9a-f]*\.\.[0-9a-f]/d
    ' <"$1" >.tmp-1
    sed -e '
	/^[dis]*imilarity index [0-9]*%$/d
	/^index [0-9a-f]*\.\.[0-9a-f]/d
    ' <"$2" >.tmp-2
    test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}
back to top