diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 13:58:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 14:36:45 (GMT) |
| commit | 085390328f5fe1dfba67039b1fd6cc51546a4e41 (patch) | |
| tree | d6db2e038ed3a08daa9def671f8c790d7589b495 /builtin/stash.c | |
| parent | ecb5091fd4301ac647db0bd2504112b38f7ee06d (diff) | |
| download | git-085390328f5fe1dfba67039b1fd6cc51546a4e41.zip git-085390328f5fe1dfba67039b1fd6cc51546a4e41.tar.gz git-085390328f5fe1dfba67039b1fd6cc51546a4e41.tar.bz2 | |
cocci: apply the "diff.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to
"diff.h".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ed12758..6c062e5 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -427,7 +427,7 @@ static void unstage_changes_unless_new(struct object_id *orig_tree) * to the index before a merge was run) and the current index * (reflecting the changes brought in by the merge). */ - diff_setup(&diff_opts); + repo_diff_setup(the_repository, &diff_opts); diff_opts.flags.recursive = 1; diff_opts.detect_rename = 0; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; |