builtin/stash.c

   1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
   2 #include "builtin.h"
   3 #include "config.h"
   4 #include "parse-options.h"
   5 #include "refs.h"
   6 #include "lockfile.h"
   7 #include "cache-tree.h"
   8 #include "unpack-trees.h"
   9 #include "merge-recursive.h"
  10 #include "argv-array.h"
  11 #include "run-command.h"
  12 #include "dir.h"
  13 #include "rerere.h"
  14 #include "revision.h"
  15 #include "log-tree.h"
  16 #include "diffcore.h"
  17 #include "exec-cmd.h"
  18
  19 #define INCLUDE_ALL_FILES 2
  20
  21 static const char * const git_stash_usage[] = {
  22         N_("git stash list [<options>]"),
  23         N_("git stash show [<options>] [<stash>]"),
  24         N_("git stash drop [-q|--quiet] [<stash>]"),
  25         N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
  26         N_("git stash branch <branchname> [<stash>]"),
  27         N_("git stash clear"),
  28         N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
  29            "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
  30            "          [--] [<pathspec>...]]"),
  31         N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
  32            "          [-u|--include-untracked] [-a|--all] [<message>]"),
  33         NULL
  34 };
  35
  36 static const char * const git_stash_list_usage[] = {
  37         N_("git stash list [<options>]"),
  38         NULL
  39 };
  40
  41 static const char * const git_stash_show_usage[] = {
  42         N_("git stash show [<options>] [<stash>]"),
  43         NULL
  44 };
  45
  46 static const char * const git_stash_drop_usage[] = {
  47         N_("git stash drop [-q|--quiet] [<stash>]"),
  48         NULL
  49 };
  50
  51 static const char * const git_stash_pop_usage[] = {
  52         N_("git stash pop [--index] [-q|--quiet] [<stash>]"),
  53         NULL
  54 };
  55
  56 static const char * const git_stash_apply_usage[] = {
  57         N_("git stash apply [--index] [-q|--quiet] [<stash>]"),
  58         NULL
  59 };
  60
  61 static const char * const git_stash_branch_usage[] = {
  62         N_("git stash branch <branchname> [<stash>]"),
  63         NULL
  64 };
  65
  66 static const char * const git_stash_clear_usage[] = {
  67         N_("git stash clear"),
  68         NULL
  69 };
  70
  71 static const char * const git_stash_store_usage[] = {
  72         N_("git stash store [-m|--message <message>] [-q|--quiet] <commit>"),
  73         NULL
  74 };
  75
  76 static const char * const git_stash_push_usage[] = {
  77         N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
  78            "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
  79            "          [--] [<pathspec>...]]"),
  80         NULL
  81 };
  82
  83 static const char * const git_stash_save_usage[] = {
  84         N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
  85            "          [-u|--include-untracked] [-a|--all] [<message>]"),
  86         NULL
  87 };
  88
  89 static const char *ref_stash = "refs/stash";
  90 static struct strbuf stash_index_path = STRBUF_INIT;
  91
  92 /*
  93  * w_commit is set to the commit containing the working tree
  94  * b_commit is set to the base commit
  95  * i_commit is set to the commit containing the index tree
  96  * u_commit is set to the commit containing the untracked files tree
  97  * w_tree is set to the working tree
  98  * b_tree is set to the base tree
  99  * i_tree is set to the index tree
 100  * u_tree is set to the untracked files tree
 101  */
 102 struct stash_info {
 103         struct object_id w_commit;
 104         struct object_id b_commit;
 105         struct object_id i_commit;
 106         struct object_id u_commit;
 107         struct object_id w_tree;
 108         struct object_id b_tree;
 109         struct object_id i_tree;
 110         struct object_id u_tree;
 111         struct strbuf revision;
 112         int is_stash_ref;
 113         int has_u;
 114 };
 115
 116 static void free_stash_info(struct stash_info *info)
 117 {
 118         strbuf_release(&info->revision);
 119 }
 120
 121 static void assert_stash_like(struct stash_info *info, const char *revision)
 122 {
 123         if (get_oidf(&info->b_commit, "%s^1", revision) ||
 124             get_oidf(&info->w_tree, "%s:", revision) ||
 125             get_oidf(&info->b_tree, "%s^1:", revision) ||
 126             get_oidf(&info->i_tree, "%s^2:", revision))
 127                 die(_("'%s' is not a stash-like commit"), revision);
 128 }
 129
 130 static int get_stash_info(struct stash_info *info, int argc, const char **argv)
 131 {
 132         int ret;
 133         char *end_of_rev;
 134         char *expanded_ref;
 135         const char *revision;
 136         const char *commit = NULL;
 137         struct object_id dummy;
 138         struct strbuf symbolic = STRBUF_INIT;
 139
 140         if (argc > 1) {
 141                 int i;
 142                 struct strbuf refs_msg = STRBUF_INIT;
 143
 144                 for (i = 0; i < argc; i++)
 145                         strbuf_addf(&refs_msg, " '%s'", argv[i]);
 146
 147                 fprintf_ln(stderr, _("Too many revisions specified:%s"),
 148                            refs_msg.buf);
 149                 strbuf_release(&refs_msg);
 150
 151                 return -1;
 152         }
 153
 154         if (argc == 1)
 155                 commit = argv[0];
 156
 157         strbuf_init(&info->revision, 0);
 158         if (!commit) {
 159                 if (!ref_exists(ref_stash)) {
 160                         free_stash_info(info);
 161                         fprintf_ln(stderr, _("No stash entries found."));
 162                         return -1;
 163                 }
 164
 165                 strbuf_addf(&info->revision, "%s@{0}", ref_stash);
 166         } else if (strspn(commit, "0123456789") == strlen(commit)) {
 167                 strbuf_addf(&info->revision, "%s@{%s}", ref_stash, commit);
 168         } else {
 169                 strbuf_addstr(&info->revision, commit);
 170         }
 171
 172         revision = info->revision.buf;
 173
 174         if (get_oid(revision, &info->w_commit)) {
 175                 error(_("%s is not a valid reference"), revision);
 176                 free_stash_info(info);
 177                 return -1;
 178         }
 179
 180         assert_stash_like(info, revision);
 181
 182         info->has_u = !get_oidf(&info->u_tree, "%s^3:", revision);
 183
 184         end_of_rev = strchrnul(revision, '@');
 185         strbuf_add(&symbolic, revision, end_of_rev - revision);
 186
 187         ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref);
 188         strbuf_release(&symbolic);
 189         switch (ret) {
 190         case 0: /* Not found, but valid ref */
 191                 info->is_stash_ref = 0;
 192                 break;
 193         case 1:
 194                 info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
 195                 break;
 196         default: /* Invalid or ambiguous */
 197                 free_stash_info(info);
 198         }
 199
 200         free(expanded_ref);
 201         return !(ret == 0 || ret == 1);
 202 }
 203
 204 static int do_clear_stash(void)
 205 {
 206         struct object_id obj;
 207         if (get_oid(ref_stash, &obj))
 208                 return 0;
 209
 210         return delete_ref(NULL, ref_stash, &obj, 0);
 211 }
 212
 213 static int clear_stash(int argc, const char **argv, const char *prefix)
 214 {
 215         struct option options[] = {
 216                 OPT_END()
 217         };
 218
 219         argc = parse_options(argc, argv, prefix, options,
 220                              git_stash_clear_usage,
 221                              PARSE_OPT_STOP_AT_NON_OPTION);
 222
 223         if (argc)
 224                 return error(_("git stash clear with parameters is "
 225                                "unimplemented"));
 226
 227         return do_clear_stash();
 228 }
 229
 230 static int reset_tree(struct object_id *i_tree, int update, int reset)
 231 {
 232         int nr_trees = 1;
 233         struct unpack_trees_options opts;
 234         struct tree_desc t[MAX_UNPACK_TREES];
 235         struct tree *tree;
 236         struct lock_file lock_file = LOCK_INIT;
 237
 238         read_cache_preload(NULL);
 239         if (refresh_cache(REFRESH_QUIET))
 240                 return -1;
 241
 242         hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 243
 244         memset(&opts, 0, sizeof(opts));
 245
 246         tree = parse_tree_indirect(i_tree);
 247         if (parse_tree(tree))
 248                 return -1;
 249
 250         init_tree_desc(t, tree->buffer, tree->size);
 251
 252         opts.head_idx = 1;
 253         opts.src_index = &the_index;
 254         opts.dst_index = &the_index;
 255         opts.merge = 1;
 256         opts.reset = reset;
 257         opts.update = update;
 258         opts.fn = oneway_merge;
 259
 260         if (unpack_trees(nr_trees, t, &opts))
 261                 return -1;
 262
 263         if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 264                 return error(_("unable to write new index file"));
 265
 266         return 0;
 267 }
 268
 269 static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit)
 270 {
 271         struct child_process cp = CHILD_PROCESS_INIT;
 272         const char *w_commit_hex = oid_to_hex(w_commit);
 273
 274         /*
 275          * Diff-tree would not be very hard to replace with a native function,
 276          * however it should be done together with apply_cached.
 277          */
 278         cp.git_cmd = 1;
 279         argv_array_pushl(&cp.args, "diff-tree", "--binary", NULL);
 280         argv_array_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
 281
 282         return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
 283 }
 284
 285 static int apply_cached(struct strbuf *out)
 286 {
 287         struct child_process cp = CHILD_PROCESS_INIT;
 288
 289         /*
 290          * Apply currently only reads either from stdin or a file, thus
 291          * apply_all_patches would have to be updated to optionally take a
 292          * buffer.
 293          */
 294         cp.git_cmd = 1;
 295         argv_array_pushl(&cp.args, "apply", "--cached", NULL);
 296         return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
 297 }
 298
 299 static int reset_head(void)
 300 {
 301         struct child_process cp = CHILD_PROCESS_INIT;
 302
 303         /*
 304          * Reset is overall quite simple, however there is no current public
 305          * API for resetting.
 306          */
 307         cp.git_cmd = 1;
 308         argv_array_push(&cp.args, "reset");
 309
 310         return run_command(&cp);
 311 }
 312
 313 static void add_diff_to_buf(struct diff_queue_struct *q,
 314                             struct diff_options *options,
 315                             void *data)
 316 {
 317         int i;
 318
 319         for (i = 0; i < q->nr; i++) {
 320                 strbuf_addstr(data, q->queue[i]->one->path);
 321
 322                 /* NUL-terminate: will be fed to update-index -z */
 323                 strbuf_addch(data, '\0');
 324         }
 325 }
 326
 327 static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
 328 {
 329         struct child_process cp = CHILD_PROCESS_INIT;
 330         const char *c_tree_hex = oid_to_hex(c_tree);
 331
 332         /*
 333          * diff-index is very similar to diff-tree above, and should be
 334          * converted together with update_index.
 335          */
 336         cp.git_cmd = 1;
 337         argv_array_pushl(&cp.args, "diff-index", "--cached", "--name-only",
 338                          "--diff-filter=A", NULL);
 339         argv_array_push(&cp.args, c_tree_hex);
 340         return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
 341 }
 342
 343 static int update_index(struct strbuf *out)
 344 {
 345         struct child_process cp = CHILD_PROCESS_INIT;
 346
 347         /*
 348          * Update-index is very complicated and may need to have a public
 349          * function exposed in order to remove this forking.
 350          */
 351         cp.git_cmd = 1;
 352         argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL);
 353         return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
 354 }
 355
 356 static int restore_untracked(struct object_id *u_tree)
 357 {
 358         int res;
 359         struct child_process cp = CHILD_PROCESS_INIT;
 360
 361         /*
 362          * We need to run restore files from a given index, but without
 363          * affecting the current index, so we use GIT_INDEX_FILE with
 364          * run_command to fork processes that will not interfere.
 365          */
 366         cp.git_cmd = 1;
 367         argv_array_push(&cp.args, "read-tree");
 368         argv_array_push(&cp.args, oid_to_hex(u_tree));
 369         argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
 370                          stash_index_path.buf);
 371         if (run_command(&cp)) {
 372                 remove_path(stash_index_path.buf);
 373                 return -1;
 374         }
 375
 376         child_process_init(&cp);
 377         cp.git_cmd = 1;
 378         argv_array_pushl(&cp.args, "checkout-index", "--all", NULL);
 379         argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
 380                          stash_index_path.buf);
 381
 382         res = run_command(&cp);
 383         remove_path(stash_index_path.buf);
 384         return res;
 385 }
 386
 387 static int do_apply_stash(const char *prefix, struct stash_info *info,
 388                           int index, int quiet)
 389 {
 390         int ret;
 391         int has_index = index;
 392         struct merge_options o;
 393         struct object_id c_tree;
 394         struct object_id index_tree;
 395         struct commit *result;
 396         const struct object_id *bases[1];
 397
 398         read_cache_preload(NULL);
 399         if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
 400                 return -1;
 401
 402         if (write_cache_as_tree(&c_tree, 0, NULL))
 403                 return error(_("cannot apply a stash in the middle of a merge"));
 404
 405         if (index) {
 406                 if (oideq(&info->b_tree, &info->i_tree) ||
 407                     oideq(&c_tree, &info->i_tree)) {
 408                         has_index = 0;
 409                 } else {
 410                         struct strbuf out = STRBUF_INIT;
 411
 412                         if (diff_tree_binary(&out, &info->w_commit)) {
 413                                 strbuf_release(&out);
 414                                 return error(_("could not generate diff %s^!."),
 415                                              oid_to_hex(&info->w_commit));
 416                         }
 417
 418                         ret = apply_cached(&out);
 419                         strbuf_release(&out);
 420                         if (ret)
 421                                 return error(_("conflicts in index."
 422                                                "Try without --index."));
 423
 424                         discard_cache();
 425                         read_cache();
 426                         if (write_cache_as_tree(&index_tree, 0, NULL))
 427                                 return error(_("could not save index tree"));
 428
 429                         reset_head();
 430                         discard_cache();
 431                         read_cache();
 432                 }
 433         }
 434
 435         if (info->has_u && restore_untracked(&info->u_tree))
 436                 return error(_("could not restore untracked files from stash"));
 437
 438         init_merge_options(&o, the_repository);
 439
 440         o.branch1 = "Updated upstream";
 441         o.branch2 = "Stashed changes";
 442
 443         if (oideq(&info->b_tree, &c_tree))
 444                 o.branch1 = "Version stash was based on";
 445
 446         if (quiet)
 447                 o.verbosity = 0;
 448
 449         if (o.verbosity >= 3)
 450                 printf_ln(_("Merging %s with %s"), o.branch1, o.branch2);
 451
 452         bases[0] = &info->b_tree;
 453
 454         ret = merge_recursive_generic(&o, &c_tree, &info->w_tree, 1, bases,
 455                                       &result);
 456         if (ret) {
 457                 rerere(0);
 458
 459                 if (index)
 460                         fprintf_ln(stderr, _("Index was not unstashed."));
 461
 462                 return ret;
 463         }
 464
 465         if (has_index) {
 466                 if (reset_tree(&index_tree, 0, 0))
 467                         return -1;
 468         } else {
 469                 struct strbuf out = STRBUF_INIT;
 470
 471                 if (get_newly_staged(&out, &c_tree)) {
 472                         strbuf_release(&out);
 473                         return -1;
 474                 }
 475
 476                 if (reset_tree(&c_tree, 0, 1)) {
 477                         strbuf_release(&out);
 478                         return -1;
 479                 }
 480
 481                 ret = update_index(&out);
 482                 strbuf_release(&out);
 483                 if (ret)
 484                         return -1;
 485
 486                 discard_cache();
 487         }
 488
 489         if (quiet) {
 490                 if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
 491                         warning("could not refresh index");
 492         } else {
 493                 struct child_process cp = CHILD_PROCESS_INIT;
 494
 495                 /*
 496                  * Status is quite simple and could be replaced with calls to
 497                  * wt_status in the future, but it adds complexities which may
 498                  * require more tests.
 499                  */
 500                 cp.git_cmd = 1;
 501                 cp.dir = prefix;
 502                 argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
 503                                  absolute_path(get_git_work_tree()));
 504                 argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
 505                                  absolute_path(get_git_dir()));
 506                 argv_array_push(&cp.args, "status");
 507                 run_command(&cp);
 508         }
 509
 510         return 0;
 511 }
 512
 513 static int apply_stash(int argc, const char **argv, const char *prefix)
 514 {
 515         int ret;
 516         int quiet = 0;
 517         int index = 0;
 518         struct stash_info info;
 519         struct option options[] = {
 520                 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 521                 OPT_BOOL(0, "index", &index,
 522                          N_("attempt to recreate the index")),
 523                 OPT_END()
 524         };
 525
 526         argc = parse_options(argc, argv, prefix, options,
 527                              git_stash_apply_usage, 0);
 528
 529         if (get_stash_info(&info, argc, argv))
 530                 return -1;
 531
 532         ret = do_apply_stash(prefix, &info, index, quiet);
 533         free_stash_info(&info);
 534         return ret;
 535 }
 536
 537 static int do_drop_stash(struct stash_info *info, int quiet)
 538 {
 539         int ret;
 540         struct child_process cp_reflog = CHILD_PROCESS_INIT;
 541         struct child_process cp = CHILD_PROCESS_INIT;
 542
 543         /*
 544          * reflog does not provide a simple function for deleting refs. One will
 545          * need to be added to avoid implementing too much reflog code here
 546          */
 547
 548         cp_reflog.git_cmd = 1;
 549         argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
 550                          "--rewrite", NULL);
 551         argv_array_push(&cp_reflog.args, info->revision.buf);
 552         ret = run_command(&cp_reflog);
 553         if (!ret) {
 554                 if (!quiet)
 555                         printf_ln(_("Dropped %s (%s)"), info->revision.buf,
 556                                   oid_to_hex(&info->w_commit));
 557         } else {
 558                 return error(_("%s: Could not drop stash entry"),
 559                              info->revision.buf);
 560         }
 561
 562         /*
 563          * This could easily be replaced by get_oid, but currently it will throw
 564          * a fatal error when a reflog is empty, which we can not recover from.
 565          */
 566         cp.git_cmd = 1;
 567         /* Even though --quiet is specified, rev-parse still outputs the hash */
 568         cp.no_stdout = 1;
 569         argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL);
 570         argv_array_pushf(&cp.args, "%s@{0}", ref_stash);
 571         ret = run_command(&cp);
 572
 573         /* do_clear_stash if we just dropped the last stash entry */
 574         if (ret)
 575                 do_clear_stash();
 576
 577         return 0;
 578 }
 579
 580 static void assert_stash_ref(struct stash_info *info)
 581 {
 582         if (!info->is_stash_ref) {
 583                 error(_("'%s' is not a stash reference"), info->revision.buf);
 584                 free_stash_info(info);
 585                 exit(1);
 586         }
 587 }
 588
 589 static int drop_stash(int argc, const char **argv, const char *prefix)
 590 {
 591         int ret;
 592         int quiet = 0;
 593         struct stash_info info;
 594         struct option options[] = {
 595                 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 596                 OPT_END()
 597         };
 598
 599         argc = parse_options(argc, argv, prefix, options,
 600                              git_stash_drop_usage, 0);
 601
 602         if (get_stash_info(&info, argc, argv))
 603                 return -1;
 604
 605         assert_stash_ref(&info);
 606
 607         ret = do_drop_stash(&info, quiet);
 608         free_stash_info(&info);
 609         return ret;
 610 }
 611
 612 static int pop_stash(int argc, const char **argv, const char *prefix)
 613 {
 614         int ret;
 615         int index = 0;
 616         int quiet = 0;
 617         struct stash_info info;
 618         struct option options[] = {
 619                 OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 620                 OPT_BOOL(0, "index", &index,
 621                          N_("attempt to recreate the index")),
 622                 OPT_END()
 623         };
 624
 625         argc = parse_options(argc, argv, prefix, options,
 626                              git_stash_pop_usage, 0);
 627
 628         if (get_stash_info(&info, argc, argv))
 629                 return -1;
 630
 631         assert_stash_ref(&info);
 632         if ((ret = do_apply_stash(prefix, &info, index, quiet)))
 633                 printf_ln(_("The stash entry is kept in case "
 634                             "you need it again."));
 635         else
 636                 ret = do_drop_stash(&info, quiet);
 637
 638         free_stash_info(&info);
 639         return ret;
 640 }
 641
 642 static int branch_stash(int argc, const char **argv, const char *prefix)
 643 {
 644         int ret;
 645         const char *branch = NULL;
 646         struct stash_info info;
 647         struct child_process cp = CHILD_PROCESS_INIT;
 648         struct option options[] = {
 649                 OPT_END()
 650         };
 651
 652         argc = parse_options(argc, argv, prefix, options,
 653                              git_stash_branch_usage, 0);
 654
 655         if (!argc) {
 656                 fprintf_ln(stderr, _("No branch name specified"));
 657                 return -1;
 658         }
 659
 660         branch = argv[0];
 661
 662         if (get_stash_info(&info, argc - 1, argv + 1))
 663                 return -1;
 664
 665         cp.git_cmd = 1;
 666         argv_array_pushl(&cp.args, "checkout", "-b", NULL);
 667         argv_array_push(&cp.args, branch);
 668         argv_array_push(&cp.args, oid_to_hex(&info.b_commit));
 669         ret = run_command(&cp);
 670         if (!ret)
 671                 ret = do_apply_stash(prefix, &info, 1, 0);
 672         if (!ret && info.is_stash_ref)
 673                 ret = do_drop_stash(&info, 0);
 674
 675         free_stash_info(&info);
 676
 677         return ret;
 678 }
 679
 680 static int list_stash(int argc, const char **argv, const char *prefix)
 681 {
 682         struct child_process cp = CHILD_PROCESS_INIT;
 683         struct option options[] = {
 684                 OPT_END()
 685         };
 686
 687         argc = parse_options(argc, argv, prefix, options,
 688                              git_stash_list_usage,
 689                              PARSE_OPT_KEEP_UNKNOWN);
 690
 691         if (!ref_exists(ref_stash))
 692                 return 0;
 693
 694         cp.git_cmd = 1;
 695         argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
 696                          "--first-parent", "-m", NULL);
 697         argv_array_pushv(&cp.args, argv);
 698         argv_array_push(&cp.args, ref_stash);
 699         argv_array_push(&cp.args, "--");
 700         return run_command(&cp);
 701 }
 702
 703 static int show_stat = 1;
 704 static int show_patch;
 705
 706 static int git_stash_config(const char *var, const char *value, void *cb)
 707 {
 708         if (!strcmp(var, "stash.showstat")) {
 709                 show_stat = git_config_bool(var, value);
 710                 return 0;
 711         }
 712         if (!strcmp(var, "stash.showpatch")) {
 713                 show_patch = git_config_bool(var, value);
 714                 return 0;
 715         }
 716         return git_default_config(var, value, cb);
 717 }
 718
 719 static int show_stash(int argc, const char **argv, const char *prefix)
 720 {
 721         int i;
 722         int ret = 0;
 723         struct stash_info info;
 724         struct rev_info rev;
 725         struct argv_array stash_args = ARGV_ARRAY_INIT;
 726         struct argv_array revision_args = ARGV_ARRAY_INIT;
 727         struct option options[] = {
 728                 OPT_END()
 729         };
 730
 731         init_diff_ui_defaults();
 732         git_config(git_diff_ui_config, NULL);
 733         init_revisions(&rev, prefix);
 734
 735         argv_array_push(&revision_args, argv[0]);
 736         for (i = 1; i < argc; i++) {
 737                 if (argv[i][0] != '-')
 738                         argv_array_push(&stash_args, argv[i]);
 739                 else
 740                         argv_array_push(&revision_args, argv[i]);
 741         }
 742
 743         ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
 744         argv_array_clear(&stash_args);
 745         if (ret)
 746                 return -1;
 747
 748         /*
 749          * The config settings are applied only if there are not passed
 750          * any options.
 751          */
 752         if (revision_args.argc == 1) {
 753                 git_config(git_stash_config, NULL);
 754                 if (show_stat)
 755                         rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
 756
 757                 if (show_patch)
 758                         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 759
 760                 if (!show_stat && !show_patch) {
 761                         free_stash_info(&info);
 762                         return 0;
 763                 }
 764         }
 765
 766         argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL);
 767         if (argc > 1) {
 768                 free_stash_info(&info);
 769                 usage_with_options(git_stash_show_usage, options);
 770         }
 771         if (!rev.diffopt.output_format) {
 772                 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 773                 diff_setup_done(&rev.diffopt);
 774         }
 775
 776         rev.diffopt.flags.recursive = 1;
 777         setup_diff_pager(&rev.diffopt);
 778         diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
 779         log_tree_diff_flush(&rev);
 780
 781         free_stash_info(&info);
 782         return diff_result_code(&rev.diffopt, 0);
 783 }
 784
 785 static int do_store_stash(const struct object_id *w_commit, const char *stash_msg,
 786                           int quiet)
 787 {
 788         if (!stash_msg)
 789                 stash_msg = "Created via \"git stash store\".";
 790
 791         if (update_ref(stash_msg, ref_stash, w_commit, NULL,
 792                        REF_FORCE_CREATE_REFLOG,
 793                        quiet ? UPDATE_REFS_QUIET_ON_ERR :
 794                        UPDATE_REFS_MSG_ON_ERR)) {
 795                 if (!quiet) {
 796                         fprintf_ln(stderr, _("Cannot update %s with %s"),
 797                                    ref_stash, oid_to_hex(w_commit));
 798                 }
 799                 return -1;
 800         }
 801
 802         return 0;
 803 }
 804
 805 static int store_stash(int argc, const char **argv, const char *prefix)
 806 {
 807         int quiet = 0;
 808         const char *stash_msg = NULL;
 809         struct object_id obj;
 810         struct object_context dummy;
 811         struct option options[] = {
 812                 OPT__QUIET(&quiet, N_("be quiet")),
 813                 OPT_STRING('m', "message", &stash_msg, "message",
 814                            N_("stash message")),
 815                 OPT_END()
 816         };
 817
 818         argc = parse_options(argc, argv, prefix, options,
 819                              git_stash_store_usage,
 820                              PARSE_OPT_KEEP_UNKNOWN);
 821
 822         if (argc != 1) {
 823                 if (!quiet)
 824                         fprintf_ln(stderr, _("\"git stash store\" requires one "
 825                                              "<commit> argument"));
 826                 return -1;
 827         }
 828
 829         if (get_oid_with_context(the_repository,
 830                                  argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
 831                                  &dummy)) {
 832                 if (!quiet)
 833                         fprintf_ln(stderr, _("Cannot update %s with %s"),
 834                                              ref_stash, argv[0]);
 835                 return -1;
 836         }
 837
 838         return do_store_stash(&obj, stash_msg, quiet);
 839 }
 840
 841 static void add_pathspecs(struct argv_array *args,
 842                           const struct pathspec *ps) {
 843         int i;
 844
 845         for (i = 0; i < ps->nr; i++)
 846                 argv_array_push(args, ps->items[i].original);
 847 }
 848
 849 /*
 850  * `untracked_files` will be filled with the names of untracked files.
 851  * The return value is:
 852  *
 853  * = 0 if there are not any untracked files
 854  * > 0 if there are untracked files
 855  */
 856 static int get_untracked_files(const struct pathspec *ps, int include_untracked,
 857                                struct strbuf *untracked_files)
 858 {
 859         int i;
 860         int max_len;
 861         int found = 0;
 862         char *seen;
 863         struct dir_struct dir;
 864
 865         memset(&dir, 0, sizeof(dir));
 866         if (include_untracked != INCLUDE_ALL_FILES)
 867                 setup_standard_excludes(&dir);
 868
 869         seen = xcalloc(ps->nr, 1);
 870
 871         max_len = fill_directory(&dir, the_repository->index, ps);
 872         for (i = 0; i < dir.nr; i++) {
 873                 struct dir_entry *ent = dir.entries[i];
 874                 if (dir_path_match(&the_index, ent, ps, max_len, seen)) {
 875                         found++;
 876                         strbuf_addstr(untracked_files, ent->name);
 877                         /* NUL-terminate: will be fed to update-index -z */
 878                         strbuf_addch(untracked_files, '\0');
 879                 }
 880                 free(ent);
 881         }
 882
 883         free(seen);
 884         free(dir.entries);
 885         free(dir.ignored);
 886         clear_directory(&dir);
 887         return found;
 888 }
 889
 890 /*
 891  * The return value of `check_changes_tracked_files()` can be:
 892  *
 893  * < 0 if there was an error
 894  * = 0 if there are no changes.
 895  * > 0 if there are changes.
 896  */
 897 static int check_changes_tracked_files(const struct pathspec *ps)
 898 {
 899         int result;
 900         struct rev_info rev;
 901         struct object_id dummy;
 902         int ret = 0;
 903
 904         /* No initial commit. */
 905         if (get_oid("HEAD", &dummy))
 906                 return -1;
 907
 908         if (read_cache() < 0)
 909                 return -1;
 910
 911         init_revisions(&rev, NULL);
 912         copy_pathspec(&rev.prune_data, ps);
 913
 914         rev.diffopt.flags.quick = 1;
 915         rev.diffopt.flags.ignore_submodules = 1;
 916         rev.abbrev = 0;
 917
 918         add_head_to_pending(&rev);
 919         diff_setup_done(&rev.diffopt);
 920
 921         result = run_diff_index(&rev, 1);
 922         if (diff_result_code(&rev.diffopt, result)) {
 923                 ret = 1;
 924                 goto done;
 925         }
 926
 927         object_array_clear(&rev.pending);
 928         result = run_diff_files(&rev, 0);
 929         if (diff_result_code(&rev.diffopt, result)) {
 930                 ret = 1;
 931                 goto done;
 932         }
 933
 934 done:
 935         clear_pathspec(&rev.prune_data);
 936         return ret;
 937 }
 938
 939 /*
 940  * The function will fill `untracked_files` with the names of untracked files
 941  * It will return 1 if there were any changes and 0 if there were not.
 942  */
 943 static int check_changes(const struct pathspec *ps, int include_untracked,
 944                          struct strbuf *untracked_files)
 945 {
 946         int ret = 0;
 947         if (check_changes_tracked_files(ps))
 948                 ret = 1;
 949
 950         if (include_untracked && get_untracked_files(ps, include_untracked,
 951                                                      untracked_files))
 952                 ret = 1;
 953
 954         return ret;
 955 }
 956
 957 static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
 958                                 struct strbuf files)
 959 {
 960         int ret = 0;
 961         struct strbuf untracked_msg = STRBUF_INIT;
 962         struct child_process cp_upd_index = CHILD_PROCESS_INIT;
 963         struct index_state istate = { NULL };
 964
 965         cp_upd_index.git_cmd = 1;
 966         argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
 967                          "--remove", "--stdin", NULL);
 968         argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
 969                          stash_index_path.buf);
 970
 971         strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
 972         if (pipe_command(&cp_upd_index, files.buf, files.len, NULL, 0,
 973                          NULL, 0)) {
 974                 ret = -1;
 975                 goto done;
 976         }
 977
 978         if (write_index_as_tree(&info->u_tree, &istate, stash_index_path.buf, 0,
 979                                 NULL)) {
 980                 ret = -1;
 981                 goto done;
 982         }
 983
 984         if (commit_tree(untracked_msg.buf, untracked_msg.len,
 985                         &info->u_tree, NULL, &info->u_commit, NULL, NULL)) {
 986                 ret = -1;
 987                 goto done;
 988         }
 989
 990 done:
 991         discard_index(&istate);
 992         strbuf_release(&untracked_msg);
 993         remove_path(stash_index_path.buf);
 994         return ret;
 995 }
 996
 997 static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 998                        struct strbuf *out_patch, int quiet)
 999 {
1000         int ret = 0;
1001         struct child_process cp_read_tree = CHILD_PROCESS_INIT;
1002         struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
1003         struct index_state istate = { NULL };
1004         char *old_index_env = NULL, *old_repo_index_file;
1005
1006         remove_path(stash_index_path.buf);
1007
1008         cp_read_tree.git_cmd = 1;
1009         argv_array_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
1010         argv_array_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
1011                          stash_index_path.buf);
1012         if (run_command(&cp_read_tree)) {
1013                 ret = -1;
1014                 goto done;
1015         }
1016
1017         /* Find out what the user wants. */
1018         old_repo_index_file = the_repository->index_file;
1019         the_repository->index_file = stash_index_path.buf;
1020         old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
1021         setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
1022
1023         ret = run_add_interactive(NULL, "--patch=stash", ps);
1024
1025         the_repository->index_file = old_repo_index_file;
1026         if (old_index_env && *old_index_env)
1027                 setenv(INDEX_ENVIRONMENT, old_index_env, 1);
1028         else
1029                 unsetenv(INDEX_ENVIRONMENT);
1030         FREE_AND_NULL(old_index_env);
1031
1032         /* State of the working tree. */
1033         if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
1034                                 NULL)) {
1035                 ret = -1;
1036                 goto done;
1037         }
1038
1039         cp_diff_tree.git_cmd = 1;
1040         argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
1041                          oid_to_hex(&info->w_tree), "--", NULL);
1042         if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) {
1043                 ret = -1;
1044                 goto done;
1045         }
1046
1047         if (!out_patch->len) {
1048                 if (!quiet)
1049                         fprintf_ln(stderr, _("No changes selected"));
1050                 ret = 1;
1051         }
1052
1053 done:
1054         discard_index(&istate);
1055         remove_path(stash_index_path.buf);
1056         return ret;
1057 }
1058
1059 static int stash_working_tree(struct stash_info *info, const struct pathspec *ps)
1060 {
1061         int ret = 0;
1062         struct rev_info rev;
1063         struct child_process cp_upd_index = CHILD_PROCESS_INIT;
1064         struct strbuf diff_output = STRBUF_INIT;
1065         struct index_state istate = { NULL };
1066
1067         init_revisions(&rev, NULL);
1068         copy_pathspec(&rev.prune_data, ps);
1069
1070         set_alternate_index_output(stash_index_path.buf);
1071         if (reset_tree(&info->i_tree, 0, 0)) {
1072                 ret = -1;
1073                 goto done;
1074         }
1075         set_alternate_index_output(NULL);
1076
1077         rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
1078         rev.diffopt.format_callback = add_diff_to_buf;
1079         rev.diffopt.format_callback_data = &diff_output;
1080
1081         if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
1082                 ret = -1;
1083                 goto done;
1084         }
1085
1086         add_pending_object(&rev, parse_object(the_repository, &info->b_commit),
1087                            "");
1088         if (run_diff_index(&rev, 0)) {
1089                 ret = -1;
1090                 goto done;
1091         }
1092
1093         cp_upd_index.git_cmd = 1;
1094         argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
1095                          "--remove", "--stdin", NULL);
1096         argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
1097                          stash_index_path.buf);
1098
1099         if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
1100                          NULL, 0, NULL, 0)) {
1101                 ret = -1;
1102                 goto done;
1103         }
1104
1105         if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
1106                                 NULL)) {
1107                 ret = -1;
1108                 goto done;
1109         }
1110
1111 done:
1112         discard_index(&istate);
1113         UNLEAK(rev);
1114         object_array_clear(&rev.pending);
1115         clear_pathspec(&rev.prune_data);
1116         strbuf_release(&diff_output);
1117         remove_path(stash_index_path.buf);
1118         return ret;
1119 }
1120
1121 static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
1122                            int include_untracked, int patch_mode,
1123                            struct stash_info *info, struct strbuf *patch,
1124                            int quiet)
1125 {
1126         int ret = 0;
1127         int flags = 0;
1128         int untracked_commit_option = 0;
1129         const char *head_short_sha1 = NULL;
1130         const char *branch_ref = NULL;
1131         const char *branch_name = "(no branch)";
1132         struct commit *head_commit = NULL;
1133         struct commit_list *parents = NULL;
1134         struct strbuf msg = STRBUF_INIT;
1135         struct strbuf commit_tree_label = STRBUF_INIT;
1136         struct strbuf untracked_files = STRBUF_INIT;
1137
1138         prepare_fallback_ident("git stash", "git@stash");
1139
1140         read_cache_preload(NULL);
1141         if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) {
1142                 ret = -1;
1143                 goto done;
1144         }
1145
1146         if (get_oid("HEAD", &info->b_commit)) {
1147                 if (!quiet)
1148                         fprintf_ln(stderr, _("You do not have "
1149                                              "the initial commit yet"));
1150                 ret = -1;
1151                 goto done;
1152         } else {
1153                 head_commit = lookup_commit(the_repository, &info->b_commit);
1154         }
1155
1156         if (!check_changes(ps, include_untracked, &untracked_files)) {
1157                 ret = 1;
1158                 goto done;
1159         }
1160
1161         branch_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
1162         if (flags & REF_ISSYMREF)
1163                 branch_name = strrchr(branch_ref, '/') + 1;
1164         head_short_sha1 = find_unique_abbrev(&head_commit->object.oid,
1165                                              DEFAULT_ABBREV);
1166         strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1);
1167         pp_commit_easy(CMIT_FMT_ONELINE, head_commit, &msg);
1168
1169         strbuf_addf(&commit_tree_label, "index on %s\n", msg.buf);
1170         commit_list_insert(head_commit, &parents);
1171         if (write_cache_as_tree(&info->i_tree, 0, NULL) ||
1172             commit_tree(commit_tree_label.buf, commit_tree_label.len,
1173                         &info->i_tree, parents, &info->i_commit, NULL, NULL)) {
1174                 if (!quiet)
1175                         fprintf_ln(stderr, _("Cannot save the current "
1176                                              "index state"));
1177                 ret = -1;
1178                 goto done;
1179         }
1180
1181         if (include_untracked) {
1182                 if (save_untracked_files(info, &msg, untracked_files)) {
1183                         if (!quiet)
1184                                 fprintf_ln(stderr, _("Cannot save "
1185                                                      "the untracked files"));
1186                         ret = -1;
1187                         goto done;
1188                 }
1189                 untracked_commit_option = 1;
1190         }
1191         if (patch_mode) {
1192                 ret = stash_patch(info, ps, patch, quiet);
1193                 if (ret < 0) {
1194                         if (!quiet)
1195                                 fprintf_ln(stderr, _("Cannot save the current "
1196                                                      "worktree state"));
1197                         goto done;
1198                 } else if (ret > 0) {
1199                         goto done;
1200                 }
1201         } else {
1202                 if (stash_working_tree(info, ps)) {
1203                         if (!quiet)
1204                                 fprintf_ln(stderr, _("Cannot save the current "
1205                                                      "worktree state"));
1206                         ret = -1;
1207                         goto done;
1208                 }
1209         }
1210
1211         if (!stash_msg_buf->len)
1212                 strbuf_addf(stash_msg_buf, "WIP on %s", msg.buf);
1213         else
1214                 strbuf_insertf(stash_msg_buf, 0, "On %s: ", branch_name);
1215
1216         /*
1217          * `parents` will be empty after calling `commit_tree()`, so there is
1218          * no need to call `free_commit_list()`
1219          */
1220         parents = NULL;
1221         if (untracked_commit_option)
1222                 commit_list_insert(lookup_commit(the_repository,
1223                                                  &info->u_commit),
1224                                    &parents);
1225         commit_list_insert(lookup_commit(the_repository, &info->i_commit),
1226                            &parents);
1227         commit_list_insert(head_commit, &parents);
1228
1229         if (commit_tree(stash_msg_buf->buf, stash_msg_buf->len, &info->w_tree,
1230                         parents, &info->w_commit, NULL, NULL)) {
1231                 if (!quiet)
1232                         fprintf_ln(stderr, _("Cannot record "
1233                                              "working tree state"));
1234                 ret = -1;
1235                 goto done;
1236         }
1237
1238 done:
1239         strbuf_release(&commit_tree_label);
1240         strbuf_release(&msg);
1241         strbuf_release(&untracked_files);
1242         return ret;
1243 }
1244
1245 static int create_stash(int argc, const char **argv, const char *prefix)
1246 {
1247         int ret = 0;
1248         struct strbuf stash_msg_buf = STRBUF_INIT;
1249         struct stash_info info;
1250         struct pathspec ps;
1251
1252         /* Starting with argv[1], since argv[0] is "create" */
1253         strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
1254
1255         memset(&ps, 0, sizeof(ps));
1256         if (!check_changes_tracked_files(&ps))
1257                 return 0;
1258
1259         ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, &info,
1260                               NULL, 0);
1261         if (!ret)
1262                 printf_ln("%s", oid_to_hex(&info.w_commit));
1263
1264         strbuf_release(&stash_msg_buf);
1265         return ret;
1266 }
1267
1268 static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
1269                          int keep_index, int patch_mode, int include_untracked)
1270 {
1271         int ret = 0;
1272         struct stash_info info;
1273         struct strbuf patch = STRBUF_INIT;
1274         struct strbuf stash_msg_buf = STRBUF_INIT;
1275         struct strbuf untracked_files = STRBUF_INIT;
1276
1277         if (patch_mode && keep_index == -1)
1278                 keep_index = 1;
1279
1280         if (patch_mode && include_untracked) {
1281                 fprintf_ln(stderr, _("Can't use --patch and --include-untracked"
1282                                      " or --all at the same time"));
1283                 ret = -1;
1284                 goto done;
1285         }
1286
1287         read_cache_preload(NULL);
1288         if (!include_untracked && ps->nr) {
1289                 int i;
1290                 char *ps_matched = xcalloc(ps->nr, 1);
1291
1292                 for (i = 0; i < active_nr; i++)
1293                         ce_path_match(&the_index, active_cache[i], ps,
1294                                       ps_matched);
1295
1296                 if (report_path_error(ps_matched, ps)) {
1297                         fprintf_ln(stderr, _("Did you forget to 'git add'?"));
1298                         ret = -1;
1299                         free(ps_matched);
1300                         goto done;
1301                 }
1302                 free(ps_matched);
1303         }
1304
1305         if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) {
1306                 ret = -1;
1307                 goto done;
1308         }
1309
1310         if (!check_changes(ps, include_untracked, &untracked_files)) {
1311                 if (!quiet)
1312                         printf_ln(_("No local changes to save"));
1313                 goto done;
1314         }
1315
1316         if (!reflog_exists(ref_stash) && do_clear_stash()) {
1317                 ret = -1;
1318                 if (!quiet)
1319                         fprintf_ln(stderr, _("Cannot initialize stash"));
1320                 goto done;
1321         }
1322
1323         if (stash_msg)
1324                 strbuf_addstr(&stash_msg_buf, stash_msg);
1325         if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
1326                             &info, &patch, quiet)) {
1327                 ret = -1;
1328                 goto done;
1329         }
1330
1331         if (do_store_stash(&info.w_commit, stash_msg_buf.buf, 1)) {
1332                 ret = -1;
1333                 if (!quiet)
1334                         fprintf_ln(stderr, _("Cannot save the current status"));
1335                 goto done;
1336         }
1337
1338         if (!quiet)
1339                 printf_ln(_("Saved working directory and index state %s"),
1340                           stash_msg_buf.buf);
1341
1342         if (!patch_mode) {
1343                 if (include_untracked && !ps->nr) {
1344                         struct child_process cp = CHILD_PROCESS_INIT;
1345
1346                         cp.git_cmd = 1;
1347                         argv_array_pushl(&cp.args, "clean", "--force",
1348                                          "--quiet", "-d", NULL);
1349                         if (include_untracked == INCLUDE_ALL_FILES)
1350                                 argv_array_push(&cp.args, "-x");
1351                         if (run_command(&cp)) {
1352                                 ret = -1;
1353                                 goto done;
1354                         }
1355                 }
1356                 discard_cache();
1357                 if (ps->nr) {
1358                         struct child_process cp_add = CHILD_PROCESS_INIT;
1359                         struct child_process cp_diff = CHILD_PROCESS_INIT;
1360                         struct child_process cp_apply = CHILD_PROCESS_INIT;
1361                         struct strbuf out = STRBUF_INIT;
1362
1363                         cp_add.git_cmd = 1;
1364                         argv_array_push(&cp_add.args, "add");
1365                         if (!include_untracked)
1366                                 argv_array_push(&cp_add.args, "-u");
1367                         if (include_untracked == INCLUDE_ALL_FILES)
1368                                 argv_array_push(&cp_add.args, "--force");
1369                         argv_array_push(&cp_add.args, "--");
1370                         add_pathspecs(&cp_add.args, ps);
1371                         if (run_command(&cp_add)) {
1372                                 ret = -1;
1373                                 goto done;
1374                         }
1375
1376                         cp_diff.git_cmd = 1;
1377                         argv_array_pushl(&cp_diff.args, "diff-index", "-p",
1378                                          "--cached", "--binary", "HEAD", "--",
1379                                          NULL);
1380                         add_pathspecs(&cp_diff.args, ps);
1381                         if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) {
1382                                 ret = -1;
1383                                 goto done;
1384                         }
1385
1386                         cp_apply.git_cmd = 1;
1387                         argv_array_pushl(&cp_apply.args, "apply", "--index",
1388                                          "-R", NULL);
1389                         if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0,
1390                                          NULL, 0)) {
1391                                 ret = -1;
1392                                 goto done;
1393                         }
1394                 } else {
1395                         struct child_process cp = CHILD_PROCESS_INIT;
1396                         cp.git_cmd = 1;
1397                         argv_array_pushl(&cp.args, "reset", "--hard", "-q",
1398                                          "--no-recurse-submodules", NULL);
1399                         if (run_command(&cp)) {
1400                                 ret = -1;
1401                                 goto done;
1402                         }
1403                 }
1404
1405                 if (keep_index == 1 && !is_null_oid(&info.i_tree)) {
1406                         struct child_process cp = CHILD_PROCESS_INIT;
1407
1408                         cp.git_cmd = 1;
1409                         argv_array_pushl(&cp.args, "checkout", "--no-overlay",
1410                                          oid_to_hex(&info.i_tree), "--", NULL);
1411                         if (!ps->nr)
1412                                 argv_array_push(&cp.args, ":/");
1413                         else
1414                                 add_pathspecs(&cp.args, ps);
1415                         if (run_command(&cp)) {
1416                                 ret = -1;
1417                                 goto done;
1418                         }
1419                 }
1420                 goto done;
1421         } else {
1422                 struct child_process cp = CHILD_PROCESS_INIT;
1423
1424                 cp.git_cmd = 1;
1425                 argv_array_pushl(&cp.args, "apply", "-R", NULL);
1426
1427                 if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) {
1428                         if (!quiet)
1429                                 fprintf_ln(stderr, _("Cannot remove "
1430                                                      "worktree changes"));
1431                         ret = -1;
1432                         goto done;
1433                 }
1434
1435                 if (keep_index < 1) {
1436                         struct child_process cp = CHILD_PROCESS_INIT;
1437
1438                         cp.git_cmd = 1;
1439                         argv_array_pushl(&cp.args, "reset", "-q", "--", NULL);
1440                         add_pathspecs(&cp.args, ps);
1441                         if (run_command(&cp)) {
1442                                 ret = -1;
1443                                 goto done;
1444                         }
1445                 }
1446                 goto done;
1447         }
1448
1449 done:
1450         strbuf_release(&stash_msg_buf);
1451         return ret;
1452 }
1453
1454 static int push_stash(int argc, const char **argv, const char *prefix)
1455 {
1456         int keep_index = -1;
1457         int patch_mode = 0;
1458         int include_untracked = 0;
1459         int quiet = 0;
1460         const char *stash_msg = NULL;
1461         struct pathspec ps;
1462         struct option options[] = {
1463                 OPT_BOOL('k', "keep-index", &keep_index,
1464                          N_("keep index")),
1465                 OPT_BOOL('p', "patch", &patch_mode,
1466                          N_("stash in patch mode")),
1467                 OPT__QUIET(&quiet, N_("quiet mode")),
1468                 OPT_BOOL('u', "include-untracked", &include_untracked,
1469                          N_("include untracked files in stash")),
1470                 OPT_SET_INT('a', "all", &include_untracked,
1471                             N_("include ignore files"), 2),
1472                 OPT_STRING('m', "message", &stash_msg, N_("message"),
1473                            N_("stash message")),
1474                 OPT_END()
1475         };
1476
1477         if (argc)
1478                 argc = parse_options(argc, argv, prefix, options,
1479                                      git_stash_push_usage,
1480                                      0);
1481
1482         parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
1483                        prefix, argv);
1484         return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
1485                              include_untracked);
1486 }
1487
1488 static int save_stash(int argc, const char **argv, const char *prefix)
1489 {
1490         int keep_index = -1;
1491         int patch_mode = 0;
1492         int include_untracked = 0;
1493         int quiet = 0;
1494         int ret = 0;
1495         const char *stash_msg = NULL;
1496         struct pathspec ps;
1497         struct strbuf stash_msg_buf = STRBUF_INIT;
1498         struct option options[] = {
1499                 OPT_BOOL('k', "keep-index", &keep_index,
1500                          N_("keep index")),
1501                 OPT_BOOL('p', "patch", &patch_mode,
1502                          N_("stash in patch mode")),
1503                 OPT__QUIET(&quiet, N_("quiet mode")),
1504                 OPT_BOOL('u', "include-untracked", &include_untracked,
1505                          N_("include untracked files in stash")),
1506                 OPT_SET_INT('a', "all", &include_untracked,
1507                             N_("include ignore files"), 2),
1508                 OPT_STRING('m', "message", &stash_msg, "message",
1509                            N_("stash message")),
1510                 OPT_END()
1511         };
1512
1513         argc = parse_options(argc, argv, prefix, options,
1514                              git_stash_save_usage,
1515                              PARSE_OPT_KEEP_DASHDASH);
1516
1517         if (argc)
1518                 stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
1519
1520         memset(&ps, 0, sizeof(ps));
1521         ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
1522                             patch_mode, include_untracked);
1523
1524         strbuf_release(&stash_msg_buf);
1525         return ret;
1526 }
1527
1528 static int use_builtin_stash(void)
1529 {
1530         struct child_process cp = CHILD_PROCESS_INIT;
1531         struct strbuf out = STRBUF_INIT;
1532         int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
1533
1534         if (env != -1)
1535                 return env;
1536
1537         argv_array_pushl(&cp.args,
1538                          "config", "--bool", "stash.usebuiltin", NULL);
1539         cp.git_cmd = 1;
1540         if (capture_command(&cp, &out, 6)) {
1541                 strbuf_release(&out);
1542                 return 1;
1543         }
1544
1545         strbuf_trim(&out);
1546         ret = !strcmp("true", out.buf);
1547         strbuf_release(&out);
1548         return ret;
1549 }
1550
1551 int cmd_stash(int argc, const char **argv, const char *prefix)
1552 {
1553         int i = -1;
1554         pid_t pid = getpid();
1555         const char *index_file;
1556         struct argv_array args = ARGV_ARRAY_INIT;
1557
1558         struct option options[] = {
1559                 OPT_END()
1560         };
1561
1562         if (!use_builtin_stash()) {
1563                 const char *path = mkpath("%s/git-legacy-stash",
1564                                           git_exec_path());
1565
1566                 if (sane_execvp(path, (char **)argv) < 0)
1567                         die_errno(_("could not exec %s"), path);
1568                 else
1569                         BUG("sane_execvp() returned???");
1570         }
1571
1572         prefix = setup_git_directory();
1573         trace_repo_setup(prefix);
1574         setup_work_tree();
1575
1576         git_config(git_diff_basic_config, NULL);
1577
1578         argc = parse_options(argc, argv, prefix, options, git_stash_usage,
1579                              PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
1580
1581         index_file = get_index_file();
1582         strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
1583                     (uintmax_t)pid);
1584
1585         if (!argc)
1586                 return !!push_stash(0, NULL, prefix);
1587         else if (!strcmp(argv[0], "apply"))
1588                 return !!apply_stash(argc, argv, prefix);
1589         else if (!strcmp(argv[0], "clear"))
1590                 return !!clear_stash(argc, argv, prefix);
1591         else if (!strcmp(argv[0], "drop"))
1592                 return !!drop_stash(argc, argv, prefix);
1593         else if (!strcmp(argv[0], "pop"))
1594                 return !!pop_stash(argc, argv, prefix);
1595         else if (!strcmp(argv[0], "branch"))
1596                 return !!branch_stash(argc, argv, prefix);
1597         else if (!strcmp(argv[0], "list"))
1598                 return !!list_stash(argc, argv, prefix);
1599         else if (!strcmp(argv[0], "show"))
1600                 return !!show_stash(argc, argv, prefix);
1601         else if (!strcmp(argv[0], "store"))
1602                 return !!store_stash(argc, argv, prefix);
1603         else if (!strcmp(argv[0], "create"))
1604                 return !!create_stash(argc, argv, prefix);
1605         else if (!strcmp(argv[0], "push"))
1606                 return !!push_stash(argc, argv, prefix);
1607         else if (!strcmp(argv[0], "save"))
1608                 return !!save_stash(argc, argv, prefix);
1609         else if (*argv[0] != '-')
1610                 usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
1611                               git_stash_usage, options);
1612
1613         if (strcmp(argv[0], "-p")) {
1614                 while (++i < argc && strcmp(argv[i], "--")) {
1615                         /*
1616                          * `akpqu` is a string which contains all short options,
1617                          * except `-m` which is verified separately.
1618                          */
1619                         if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
1620                             strchr("akpqu", argv[i][1]))
1621                                 continue;
1622
1623                         if (!strcmp(argv[i], "--all") ||
1624                             !strcmp(argv[i], "--keep-index") ||
1625                             !strcmp(argv[i], "--no-keep-index") ||
1626                             !strcmp(argv[i], "--patch") ||
1627                             !strcmp(argv[i], "--quiet") ||
1628                             !strcmp(argv[i], "--include-untracked"))
1629                                 continue;
1630
1631                         /*
1632                          * `-m` and `--message=` are verified separately because
1633                          * they need to be immediately followed by a string
1634                          * (i.e.`-m"foobar"` or `--message="foobar"`).
1635                          */
1636                         if (starts_with(argv[i], "-m") ||
1637                             starts_with(argv[i], "--message="))
1638                                 continue;
1639
1640                         usage_with_options(git_stash_usage, options);
1641                 }
1642         }
1643
1644         argv_array_push(&args, "push");
1645         argv_array_pushv(&args, argv);
1646         return !!push_stash(args.argc, args.argv, prefix);
1647 }