global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 23:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/patch' into next

Browse Source 
* js/patch:
  diff.c: fix get_patch_id()
  t4014: fix test commit labels.
This commit is contained in:
Junio C Hamano
2006-06-28 22:50:00 -07:00
parent bae21f8b33 9fdc3bb5c2
commit a84b559e0c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -2217,7 +2217,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 3;
xecfg.flags = 3;
xecfg.flags = XDL_EMIT_FUNCNAMES;
ecb.outf = xdiff_outf;
ecb.priv = &data;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);

6
t/t4014-format-patch.sh
View File

@@ -21,15 +21,15 @@ test_expect_success setup '
for i in D E F; do echo "$i"; done >>file &&
git update-index file &&
git commit -m "Side change #2" &&
git tag C1 &&
git tag C2 &&
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
git update-index file &&
git commit -m "Side change #3" &&
git checkout master &&
git diff-tree -p C1 | git apply --index &&
git commit -m "Master accepts moral equivalent of #1"
git diff-tree -p C2 | git apply --index &&
git commit -m "Master accepts moral equivalent of #2"
'