diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 01:50:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 01:50:06 +0300 |
| commit | e81ecff10a19acea0bf58a260e919b1920925108 (patch) | |
| tree | 5fb4f0fcd7df32cac63676d32b87b5b38bfe7637 /builtin/stash.c | |
| parent | 56a1d9ca6b069b707f2f728bf74cd928bfa2a88e (diff) | |
| parent | 7723436149b971643995f877b9df68d17f635012 (diff) | |
Merge branch 'js/stash-p-fix'
Allowing the user to split a patch hunk while "git stash -p" does
not work well; a band-aid has been added to make this (partially)
work better.
* js/stash-p-fix:
stash -p: (partially) fix bug concerning split hunks
t3904: fix incorrect demonstration of a bug
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 6d586ef06d..a43a92ec74 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1041,7 +1041,7 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps, } cp_diff_tree.git_cmd = 1; - argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD", + argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD", oid_to_hex(&info->w_tree), "--", NULL); if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { ret = -1; |