4 * Based on git-am.sh by Junio C Hamano.
9 #include "parse-options.h"
11 #include "run-command.h"
14 #include "cache-tree.h"
19 #include "unpack-trees.h"
23 * Returns 1 if the file is empty or does not exist, 0 otherwise.
25 static int is_empty_file(const char *filename
)
29 if (stat(filename
, &st
) < 0) {
32 die_errno(_("could not stat %s"), filename
);
39 * Like strbuf_getline(), but treats both '\n' and "\r\n" as line terminators.
41 static int strbuf_getline_crlf(struct strbuf
*sb
, FILE *fp
)
43 if (strbuf_getwholeline(sb
, fp
, '\n'))
45 if (sb
->buf
[sb
->len
- 1] == '\n') {
46 strbuf_setlen(sb
, sb
->len
- 1);
47 if (sb
->len
> 0 && sb
->buf
[sb
->len
- 1] == '\r')
48 strbuf_setlen(sb
, sb
->len
- 1);
54 * Returns the length of the first line of msg.
56 static int linelen(const char *msg
)
58 return strchrnul(msg
, '\n') - msg
;
62 PATCH_FORMAT_UNKNOWN
= 0,
67 /* state directory path */
70 /* current and last patch numbers, 1-indexed */
74 /* commit metadata and message */
81 /* number of digits in patch filename */
84 /* various operating modes and command line options */
89 * Initializes am_state with the default values. The state directory is set to
92 static void am_state_init(struct am_state
*state
, const char *dir
)
94 memset(state
, 0, sizeof(*state
));
97 state
->dir
= xstrdup(dir
);
103 * Releases memory allocated by an am_state.
105 static void am_state_release(struct am_state
*state
)
108 free(state
->author_name
);
109 free(state
->author_email
);
110 free(state
->author_date
);
115 * Returns path relative to the am_state directory.
117 static inline const char *am_path(const struct am_state
*state
, const char *path
)
119 return mkpath("%s/%s", state
->dir
, path
);
123 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline
126 static void say(const struct am_state
*state
, FILE *fp
, const char *fmt
, ...)
132 vfprintf(fp
, fmt
, ap
);
139 * Returns 1 if there is an am session in progress, 0 otherwise.
141 static int am_in_progress(const struct am_state
*state
)
145 if (lstat(state
->dir
, &st
) < 0 || !S_ISDIR(st
.st_mode
))
147 if (lstat(am_path(state
, "last"), &st
) || !S_ISREG(st
.st_mode
))
149 if (lstat(am_path(state
, "next"), &st
) || !S_ISREG(st
.st_mode
))
155 * Reads the contents of `file` in the `state` directory into `sb`. Returns the
156 * number of bytes read on success, -1 if the file does not exist. If `trim` is
157 * set, trailing whitespace will be removed.
159 static int read_state_file(struct strbuf
*sb
, const struct am_state
*state
,
160 const char *file
, int trim
)
164 if (strbuf_read_file(sb
, am_path(state
, file
), 0) >= 0) {
174 die_errno(_("could not read '%s'"), am_path(state
, file
));
178 * Reads a KEY=VALUE shell variable assignment from `fp`, returning the VALUE
179 * as a newly-allocated string. VALUE must be a quoted string, and the KEY must
180 * match `key`. Returns NULL on failure.
182 * This is used by read_author_script() to read the GIT_AUTHOR_* variables from
185 static char *read_shell_var(FILE *fp
, const char *key
)
187 struct strbuf sb
= STRBUF_INIT
;
190 if (strbuf_getline(&sb
, fp
, '\n'))
193 if (!skip_prefix(sb
.buf
, key
, &str
))
196 if (!skip_prefix(str
, "=", &str
))
199 strbuf_remove(&sb
, 0, str
- sb
.buf
);
201 str
= sq_dequote(sb
.buf
);
205 return strbuf_detach(&sb
, NULL
);
213 * Reads and parses the state directory's "author-script" file, and sets
214 * state->author_name, state->author_email and state->author_date accordingly.
215 * Returns 0 on success, -1 if the file could not be parsed.
217 * The author script is of the format:
219 * GIT_AUTHOR_NAME='$author_name'
220 * GIT_AUTHOR_EMAIL='$author_email'
221 * GIT_AUTHOR_DATE='$author_date'
223 * where $author_name, $author_email and $author_date are quoted. We are strict
224 * with our parsing, as the file was meant to be eval'd in the old git-am.sh
225 * script, and thus if the file differs from what this function expects, it is
226 * better to bail out than to do something that the user does not expect.
228 static int read_author_script(struct am_state
*state
)
230 const char *filename
= am_path(state
, "author-script");
233 assert(!state
->author_name
);
234 assert(!state
->author_email
);
235 assert(!state
->author_date
);
237 fp
= fopen(filename
, "r");
241 die_errno(_("could not open '%s' for reading"), filename
);
244 state
->author_name
= read_shell_var(fp
, "GIT_AUTHOR_NAME");
245 if (!state
->author_name
) {
250 state
->author_email
= read_shell_var(fp
, "GIT_AUTHOR_EMAIL");
251 if (!state
->author_email
) {
256 state
->author_date
= read_shell_var(fp
, "GIT_AUTHOR_DATE");
257 if (!state
->author_date
) {
262 if (fgetc(fp
) != EOF
) {
272 * Saves state->author_name, state->author_email and state->author_date in the
273 * state directory's "author-script" file.
275 static void write_author_script(const struct am_state
*state
)
277 struct strbuf sb
= STRBUF_INIT
;
279 strbuf_addstr(&sb
, "GIT_AUTHOR_NAME=");
280 sq_quote_buf(&sb
, state
->author_name
);
281 strbuf_addch(&sb
, '\n');
283 strbuf_addstr(&sb
, "GIT_AUTHOR_EMAIL=");
284 sq_quote_buf(&sb
, state
->author_email
);
285 strbuf_addch(&sb
, '\n');
287 strbuf_addstr(&sb
, "GIT_AUTHOR_DATE=");
288 sq_quote_buf(&sb
, state
->author_date
);
289 strbuf_addch(&sb
, '\n');
291 write_file(am_path(state
, "author-script"), 1, "%s", sb
.buf
);
297 * Reads the commit message from the state directory's "final-commit" file,
298 * setting state->msg to its contents and state->msg_len to the length of its
301 * Returns 0 on success, -1 if the file does not exist.
303 static int read_commit_msg(struct am_state
*state
)
305 struct strbuf sb
= STRBUF_INIT
;
309 if (read_state_file(&sb
, state
, "final-commit", 0) < 0) {
314 state
->msg
= strbuf_detach(&sb
, &state
->msg_len
);
319 * Saves state->msg in the state directory's "final-commit" file.
321 static void write_commit_msg(const struct am_state
*state
)
324 const char *filename
= am_path(state
, "final-commit");
326 fd
= xopen(filename
, O_WRONLY
| O_CREAT
, 0666);
327 if (write_in_full(fd
, state
->msg
, state
->msg_len
) < 0)
328 die_errno(_("could not write to %s"), filename
);
333 * Loads state from disk.
335 static void am_load(struct am_state
*state
)
337 struct strbuf sb
= STRBUF_INIT
;
339 if (read_state_file(&sb
, state
, "next", 1) < 0)
340 die("BUG: state file 'next' does not exist");
341 state
->cur
= strtol(sb
.buf
, NULL
, 10);
343 if (read_state_file(&sb
, state
, "last", 1) < 0)
344 die("BUG: state file 'last' does not exist");
345 state
->last
= strtol(sb
.buf
, NULL
, 10);
347 if (read_author_script(state
) < 0)
348 die(_("could not parse author script"));
350 read_commit_msg(state
);
352 read_state_file(&sb
, state
, "quiet", 1);
353 state
->quiet
= !strcmp(sb
.buf
, "t");
359 * Removes the am_state directory, forcefully terminating the current am
362 static void am_destroy(const struct am_state
*state
)
364 struct strbuf sb
= STRBUF_INIT
;
366 strbuf_addstr(&sb
, state
->dir
);
367 remove_dir_recursively(&sb
, 0);
372 * Determines if the file looks like a piece of RFC2822 mail by grabbing all
373 * non-indented lines and checking if they look like they begin with valid
374 * header field names.
376 * Returns 1 if the file looks like a piece of mail, 0 otherwise.
378 static int is_mail(FILE *fp
)
380 const char *header_regex
= "^[!-9;-~]+:";
381 struct strbuf sb
= STRBUF_INIT
;
385 if (fseek(fp
, 0L, SEEK_SET
))
386 die_errno(_("fseek failed"));
388 if (regcomp(®ex
, header_regex
, REG_NOSUB
| REG_EXTENDED
))
389 die("invalid pattern: %s", header_regex
);
391 while (!strbuf_getline_crlf(&sb
, fp
)) {
393 break; /* End of header */
395 /* Ignore indented folded lines */
396 if (*sb
.buf
== '\t' || *sb
.buf
== ' ')
399 /* It's a header if it matches header_regex */
400 if (regexec(®ex
, sb
.buf
, 0, NULL
, 0)) {
413 * Attempts to detect the patch_format of the patches contained in `paths`,
414 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if
417 static int detect_patch_format(const char **paths
)
419 enum patch_format ret
= PATCH_FORMAT_UNKNOWN
;
420 struct strbuf l1
= STRBUF_INIT
;
424 * We default to mbox format if input is from stdin and for directories
426 if (!*paths
|| !strcmp(*paths
, "-") || is_directory(*paths
))
427 return PATCH_FORMAT_MBOX
;
430 * Otherwise, check the first few lines of the first patch, starting
431 * from the first non-blank line, to try to detect its format.
434 fp
= xfopen(*paths
, "r");
436 while (!strbuf_getline_crlf(&l1
, fp
)) {
441 if (starts_with(l1
.buf
, "From ") || starts_with(l1
.buf
, "From: ")) {
442 ret
= PATCH_FORMAT_MBOX
;
446 if (l1
.len
&& is_mail(fp
)) {
447 ret
= PATCH_FORMAT_MBOX
;
458 * Splits out individual email patches from `paths`, where each path is either
459 * a mbox file or a Maildir. Returns 0 on success, -1 on failure.
461 static int split_mail_mbox(struct am_state
*state
, const char **paths
)
463 struct child_process cp
= CHILD_PROCESS_INIT
;
464 struct strbuf last
= STRBUF_INIT
;
467 argv_array_push(&cp
.args
, "mailsplit");
468 argv_array_pushf(&cp
.args
, "-d%d", state
->prec
);
469 argv_array_pushf(&cp
.args
, "-o%s", state
->dir
);
470 argv_array_push(&cp
.args
, "-b");
471 argv_array_push(&cp
.args
, "--");
472 argv_array_pushv(&cp
.args
, paths
);
474 if (capture_command(&cp
, &last
, 8))
478 state
->last
= strtol(last
.buf
, NULL
, 10);
484 * Splits a list of files/directories into individual email patches. Each path
485 * in `paths` must be a file/directory that is formatted according to
488 * Once split out, the individual email patches will be stored in the state
489 * directory, with each patch's filename being its index, padded to state->prec
492 * state->cur will be set to the index of the first mail, and state->last will
493 * be set to the index of the last mail.
495 * Returns 0 on success, -1 on failure.
497 static int split_mail(struct am_state
*state
, enum patch_format patch_format
,
500 switch (patch_format
) {
501 case PATCH_FORMAT_MBOX
:
502 return split_mail_mbox(state
, paths
);
504 die("BUG: invalid patch_format");
510 * Setup a new am session for applying patches
512 static void am_setup(struct am_state
*state
, enum patch_format patch_format
,
515 unsigned char curr_head
[GIT_SHA1_RAWSZ
];
518 patch_format
= detect_patch_format(paths
);
521 fprintf_ln(stderr
, _("Patch format detection failed."));
525 if (mkdir(state
->dir
, 0777) < 0 && errno
!= EEXIST
)
526 die_errno(_("failed to create directory '%s'"), state
->dir
);
528 if (split_mail(state
, patch_format
, paths
) < 0) {
530 die(_("Failed to split patches."));
533 write_file(am_path(state
, "quiet"), 1, state
->quiet
? "t" : "f");
535 if (!get_sha1("HEAD", curr_head
)) {
536 write_file(am_path(state
, "abort-safety"), 1, "%s", sha1_to_hex(curr_head
));
537 update_ref("am", "ORIG_HEAD", curr_head
, NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
539 write_file(am_path(state
, "abort-safety"), 1, "%s", "");
540 delete_ref("ORIG_HEAD", NULL
, 0);
544 * NOTE: Since the "next" and "last" files determine if an am_state
545 * session is in progress, they should be written last.
548 write_file(am_path(state
, "next"), 1, "%d", state
->cur
);
550 write_file(am_path(state
, "last"), 1, "%d", state
->last
);
554 * Increments the patch pointer, and cleans am_state for the application of the
557 static void am_next(struct am_state
*state
)
559 unsigned char head
[GIT_SHA1_RAWSZ
];
561 free(state
->author_name
);
562 state
->author_name
= NULL
;
564 free(state
->author_email
);
565 state
->author_email
= NULL
;
567 free(state
->author_date
);
568 state
->author_date
= NULL
;
574 unlink(am_path(state
, "author-script"));
575 unlink(am_path(state
, "final-commit"));
577 if (!get_sha1("HEAD", head
))
578 write_file(am_path(state
, "abort-safety"), 1, "%s", sha1_to_hex(head
));
580 write_file(am_path(state
, "abort-safety"), 1, "%s", "");
583 write_file(am_path(state
, "next"), 1, "%d", state
->cur
);
587 * Returns the filename of the current patch email.
589 static const char *msgnum(const struct am_state
*state
)
591 static struct strbuf sb
= STRBUF_INIT
;
594 strbuf_addf(&sb
, "%0*d", state
->prec
, state
->cur
);
600 * Refresh and write index.
602 static void refresh_and_write_cache(void)
604 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
606 hold_locked_index(lock_file
, 1);
607 refresh_cache(REFRESH_QUIET
);
608 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
609 die(_("unable to write index file"));
613 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn
614 * branch, returns 1 if there are entries in the index, 0 otherwise. If an
615 * strbuf is provided, the space-separated list of files that differ will be
618 static int index_has_changes(struct strbuf
*sb
)
620 unsigned char head
[GIT_SHA1_RAWSZ
];
623 if (!get_sha1_tree("HEAD", head
)) {
624 struct diff_options opt
;
627 DIFF_OPT_SET(&opt
, EXIT_WITH_STATUS
);
629 DIFF_OPT_SET(&opt
, QUICK
);
630 do_diff_cache(head
, &opt
);
632 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
634 strbuf_addch(sb
, ' ');
635 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
638 return DIFF_OPT_TST(&opt
, HAS_CHANGES
) != 0;
640 for (i
= 0; sb
&& i
< active_nr
; i
++) {
642 strbuf_addch(sb
, ' ');
643 strbuf_addstr(sb
, active_cache
[i
]->name
);
650 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.
651 * state->msg will be set to the patch message. state->author_name,
652 * state->author_email and state->author_date will be set to the patch author's
653 * name, email and date respectively. The patch body will be written to the
654 * state directory's "patch" file.
656 * Returns 1 if the patch should be skipped, 0 otherwise.
658 static int parse_mail(struct am_state
*state
, const char *mail
)
661 struct child_process cp
= CHILD_PROCESS_INIT
;
662 struct strbuf sb
= STRBUF_INIT
;
663 struct strbuf msg
= STRBUF_INIT
;
664 struct strbuf author_name
= STRBUF_INIT
;
665 struct strbuf author_date
= STRBUF_INIT
;
666 struct strbuf author_email
= STRBUF_INIT
;
670 cp
.in
= xopen(mail
, O_RDONLY
, 0);
671 cp
.out
= xopen(am_path(state
, "info"), O_WRONLY
| O_CREAT
, 0777);
673 argv_array_push(&cp
.args
, "mailinfo");
674 argv_array_push(&cp
.args
, am_path(state
, "msg"));
675 argv_array_push(&cp
.args
, am_path(state
, "patch"));
677 if (run_command(&cp
) < 0)
678 die("could not parse patch");
683 /* Extract message and author information */
684 fp
= xfopen(am_path(state
, "info"), "r");
685 while (!strbuf_getline(&sb
, fp
, '\n')) {
688 if (skip_prefix(sb
.buf
, "Subject: ", &x
)) {
690 strbuf_addch(&msg
, '\n');
691 strbuf_addstr(&msg
, x
);
692 } else if (skip_prefix(sb
.buf
, "Author: ", &x
))
693 strbuf_addstr(&author_name
, x
);
694 else if (skip_prefix(sb
.buf
, "Email: ", &x
))
695 strbuf_addstr(&author_email
, x
);
696 else if (skip_prefix(sb
.buf
, "Date: ", &x
))
697 strbuf_addstr(&author_date
, x
);
701 /* Skip pine's internal folder data */
702 if (!strcmp(author_name
.buf
, "Mail System Internal Data")) {
707 if (is_empty_file(am_path(state
, "patch"))) {
708 printf_ln(_("Patch is empty. Was it split wrong?"));
712 strbuf_addstr(&msg
, "\n\n");
713 if (strbuf_read_file(&msg
, am_path(state
, "msg"), 0) < 0)
714 die_errno(_("could not read '%s'"), am_path(state
, "msg"));
717 assert(!state
->author_name
);
718 state
->author_name
= strbuf_detach(&author_name
, NULL
);
720 assert(!state
->author_email
);
721 state
->author_email
= strbuf_detach(&author_email
, NULL
);
723 assert(!state
->author_date
);
724 state
->author_date
= strbuf_detach(&author_date
, NULL
);
727 state
->msg
= strbuf_detach(&msg
, &state
->msg_len
);
730 strbuf_release(&msg
);
731 strbuf_release(&author_date
);
732 strbuf_release(&author_email
);
733 strbuf_release(&author_name
);
739 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise.
741 static int run_apply(const struct am_state
*state
)
743 struct child_process cp
= CHILD_PROCESS_INIT
;
747 argv_array_push(&cp
.args
, "apply");
748 argv_array_push(&cp
.args
, "--index");
749 argv_array_push(&cp
.args
, am_path(state
, "patch"));
751 if (run_command(&cp
))
754 /* Reload index as git-apply will have modified it. */
762 * Commits the current index with state->msg as the commit message and
763 * state->author_name, state->author_email and state->author_date as the author
766 static void do_commit(const struct am_state
*state
)
768 unsigned char tree
[GIT_SHA1_RAWSZ
], parent
[GIT_SHA1_RAWSZ
],
769 commit
[GIT_SHA1_RAWSZ
];
771 struct commit_list
*parents
= NULL
;
772 const char *reflog_msg
, *author
;
773 struct strbuf sb
= STRBUF_INIT
;
775 if (write_cache_as_tree(tree
, 0, NULL
))
776 die(_("git write-tree failed to write a tree"));
778 if (!get_sha1_commit("HEAD", parent
)) {
780 commit_list_insert(lookup_commit(parent
), &parents
);
783 say(state
, stderr
, _("applying to an empty history"));
786 author
= fmt_ident(state
->author_name
, state
->author_email
,
787 state
->author_date
, IDENT_STRICT
);
789 if (commit_tree(state
->msg
, state
->msg_len
, tree
, parents
, commit
,
791 die(_("failed to write commit object"));
793 reflog_msg
= getenv("GIT_REFLOG_ACTION");
797 strbuf_addf(&sb
, "%s: %.*s", reflog_msg
, linelen(state
->msg
),
800 update_ref(sb
.buf
, "HEAD", commit
, ptr
, 0, UPDATE_REFS_DIE_ON_ERR
);
806 * Validates the am_state for resuming -- the "msg" and authorship fields must
809 static void validate_resume_state(const struct am_state
*state
)
812 die(_("cannot resume: %s does not exist."),
813 am_path(state
, "final-commit"));
815 if (!state
->author_name
|| !state
->author_email
|| !state
->author_date
)
816 die(_("cannot resume: %s does not exist."),
817 am_path(state
, "author-script"));
821 * Applies all queued mail.
823 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as
824 * well as the state directory's "patch" file is used as-is for applying the
825 * patch and committing it.
827 static void am_run(struct am_state
*state
, int resume
)
829 const char *argv_gc_auto
[] = {"gc", "--auto", NULL
};
830 struct strbuf sb
= STRBUF_INIT
;
832 unlink(am_path(state
, "dirtyindex"));
834 refresh_and_write_cache();
836 if (index_has_changes(&sb
)) {
837 write_file(am_path(state
, "dirtyindex"), 1, "t");
838 die(_("Dirty index: cannot apply patches (dirty: %s)"), sb
.buf
);
843 while (state
->cur
<= state
->last
) {
844 const char *mail
= am_path(state
, msgnum(state
));
846 if (!file_exists(mail
))
850 validate_resume_state(state
);
853 if (parse_mail(state
, mail
))
854 goto next
; /* mail should be skipped */
856 write_author_script(state
);
857 write_commit_msg(state
);
860 say(state
, stdout
, _("Applying: %.*s"), linelen(state
->msg
), state
->msg
);
862 if (run_apply(state
) < 0) {
863 int advice_amworkdir
= 1;
865 printf_ln(_("Patch failed at %s %.*s"), msgnum(state
),
866 linelen(state
->msg
), state
->msg
);
868 git_config_get_bool("advice.amworkdir", &advice_amworkdir
);
870 if (advice_amworkdir
)
871 printf_ln(_("The copy of the patch that failed is found in: %s"),
872 am_path(state
, "patch"));
884 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
888 * Resume the current am session after patch application failure. The user did
889 * all the hard work, and we do not have to do any patch application. Just
890 * trust and commit what the user has in the index and working tree.
892 static void am_resolve(struct am_state
*state
)
894 validate_resume_state(state
);
896 say(state
, stdout
, _("Applying: %.*s"), linelen(state
->msg
), state
->msg
);
898 if (!index_has_changes(NULL
)) {
899 printf_ln(_("No changes - did you forget to use 'git add'?\n"
900 "If there is nothing left to stage, chances are that something else\n"
901 "already introduced the same changes; you might want to skip this patch."));
905 if (unmerged_cache()) {
906 printf_ln(_("You still have unmerged paths in your index.\n"
907 "Did you forget to use 'git add'?"));
918 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is
919 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on
922 static int fast_forward_to(struct tree
*head
, struct tree
*remote
, int reset
)
924 struct lock_file
*lock_file
;
925 struct unpack_trees_options opts
;
926 struct tree_desc t
[2];
928 if (parse_tree(head
) || parse_tree(remote
))
931 lock_file
= xcalloc(1, sizeof(struct lock_file
));
932 hold_locked_index(lock_file
, 1);
934 refresh_cache(REFRESH_QUIET
);
936 memset(&opts
, 0, sizeof(opts
));
938 opts
.src_index
= &the_index
;
939 opts
.dst_index
= &the_index
;
943 opts
.fn
= twoway_merge
;
944 init_tree_desc(&t
[0], head
->buffer
, head
->size
);
945 init_tree_desc(&t
[1], remote
->buffer
, remote
->size
);
947 if (unpack_trees(2, t
, &opts
)) {
948 rollback_lock_file(lock_file
);
952 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
953 die(_("unable to write new index file"));
959 * Clean the index without touching entries that are not modified between
960 * `head` and `remote`.
962 static int clean_index(const unsigned char *head
, const unsigned char *remote
)
964 struct lock_file
*lock_file
;
965 struct tree
*head_tree
, *remote_tree
, *index_tree
;
966 unsigned char index
[GIT_SHA1_RAWSZ
];
967 struct pathspec pathspec
;
969 head_tree
= parse_tree_indirect(head
);
971 return error(_("Could not parse object '%s'."), sha1_to_hex(head
));
973 remote_tree
= parse_tree_indirect(remote
);
975 return error(_("Could not parse object '%s'."), sha1_to_hex(remote
));
977 read_cache_unmerged();
979 if (fast_forward_to(head_tree
, head_tree
, 1))
982 if (write_cache_as_tree(index
, 0, NULL
))
985 index_tree
= parse_tree_indirect(index
);
987 return error(_("Could not parse object '%s'."), sha1_to_hex(index
));
989 if (fast_forward_to(index_tree
, remote_tree
, 0))
992 memset(&pathspec
, 0, sizeof(pathspec
));
994 lock_file
= xcalloc(1, sizeof(struct lock_file
));
995 hold_locked_index(lock_file
, 1);
997 if (read_tree(remote_tree
, 0, &pathspec
)) {
998 rollback_lock_file(lock_file
);
1002 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1003 die(_("unable to write new index file"));
1005 remove_branch_state();
1011 * Resume the current am session by skipping the current patch.
1013 static void am_skip(struct am_state
*state
)
1015 unsigned char head
[GIT_SHA1_RAWSZ
];
1017 if (get_sha1("HEAD", head
))
1018 hashcpy(head
, EMPTY_TREE_SHA1_BIN
);
1020 if (clean_index(head
, head
))
1021 die(_("failed to clean index"));
1028 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.
1030 * It is not safe to reset HEAD when:
1031 * 1. git-am previously failed because the index was dirty.
1032 * 2. HEAD has moved since git-am previously failed.
1034 static int safe_to_abort(const struct am_state
*state
)
1036 struct strbuf sb
= STRBUF_INIT
;
1037 unsigned char abort_safety
[GIT_SHA1_RAWSZ
], head
[GIT_SHA1_RAWSZ
];
1039 if (file_exists(am_path(state
, "dirtyindex")))
1042 if (read_state_file(&sb
, state
, "abort-safety", 1) > 0) {
1043 if (get_sha1_hex(sb
.buf
, abort_safety
))
1044 die(_("could not parse %s"), am_path(state
, "abort_safety"));
1046 hashclr(abort_safety
);
1048 if (get_sha1("HEAD", head
))
1051 if (!hashcmp(head
, abort_safety
))
1054 error(_("You seem to have moved HEAD since the last 'am' failure.\n"
1055 "Not rewinding to ORIG_HEAD"));
1061 * Aborts the current am session if it is safe to do so.
1063 static void am_abort(struct am_state
*state
)
1065 unsigned char curr_head
[GIT_SHA1_RAWSZ
], orig_head
[GIT_SHA1_RAWSZ
];
1066 int has_curr_head
, has_orig_head
;
1069 if (!safe_to_abort(state
)) {
1074 curr_branch
= resolve_refdup("HEAD", 0, curr_head
, NULL
);
1075 has_curr_head
= !is_null_sha1(curr_head
);
1077 hashcpy(curr_head
, EMPTY_TREE_SHA1_BIN
);
1079 has_orig_head
= !get_sha1("ORIG_HEAD", orig_head
);
1081 hashcpy(orig_head
, EMPTY_TREE_SHA1_BIN
);
1083 clean_index(curr_head
, orig_head
);
1086 update_ref("am --abort", "HEAD", orig_head
,
1087 has_curr_head
? curr_head
: NULL
, 0,
1088 UPDATE_REFS_DIE_ON_ERR
);
1089 else if (curr_branch
)
1090 delete_ref(curr_branch
, NULL
, REF_NODEREF
);
1097 * parse_options() callback that validates and sets opt->value to the
1098 * PATCH_FORMAT_* enum value corresponding to `arg`.
1100 static int parse_opt_patchformat(const struct option
*opt
, const char *arg
, int unset
)
1102 int *opt_value
= opt
->value
;
1104 if (!strcmp(arg
, "mbox"))
1105 *opt_value
= PATCH_FORMAT_MBOX
;
1107 return error(_("Invalid value for --patch-format: %s"), arg
);
1119 int cmd_am(int argc
, const char **argv
, const char *prefix
)
1121 struct am_state state
;
1122 int patch_format
= PATCH_FORMAT_UNKNOWN
;
1123 enum resume_mode resume
= RESUME_FALSE
;
1125 const char * const usage
[] = {
1126 N_("git am [options] [(<mbox>|<Maildir>)...]"),
1127 N_("git am [options] (--continue | --skip | --abort)"),
1131 struct option options
[] = {
1132 OPT__QUIET(&state
.quiet
, N_("be quiet")),
1133 OPT_CALLBACK(0, "patch-format", &patch_format
, N_("format"),
1134 N_("format the patch(es) are in"),
1135 parse_opt_patchformat
),
1136 OPT_CMDMODE(0, "continue", &resume
,
1137 N_("continue applying patches after resolving a conflict"),
1139 OPT_CMDMODE('r', "resolved", &resume
,
1140 N_("synonyms for --continue"),
1142 OPT_CMDMODE(0, "skip", &resume
,
1143 N_("skip the current patch"),
1145 OPT_CMDMODE(0, "abort", &resume
,
1146 N_("restore the original branch and abort the patching operation."),
1152 * NEEDSWORK: Once all the features of git-am.sh have been
1153 * re-implemented in builtin/am.c, this preamble can be removed.
1155 if (!getenv("_GIT_USE_BUILTIN_AM")) {
1156 const char *path
= mkpath("%s/git-am", git_exec_path());
1158 if (sane_execvp(path
, (char **)argv
) < 0)
1159 die_errno("could not exec %s", path
);
1161 prefix
= setup_git_directory();
1162 trace_repo_setup(prefix
);
1166 git_config(git_default_config
, NULL
);
1168 am_state_init(&state
, git_path("rebase-apply"));
1170 argc
= parse_options(argc
, argv
, prefix
, options
, usage
, 0);
1172 if (read_index_preload(&the_index
, NULL
) < 0)
1173 die(_("failed to read the index"));
1175 if (am_in_progress(&state
)) {
1177 * Catch user error to feed us patches when there is a session
1180 * 1. mbox path(s) are provided on the command-line.
1181 * 2. stdin is not a tty: the user is trying to feed us a patch
1182 * from standard input. This is somewhat unreliable -- stdin
1183 * could be /dev/null for example and the caller did not
1184 * intend to feed us a patch but wanted to continue
1187 if (argc
|| (resume
== RESUME_FALSE
&& !isatty(0)))
1188 die(_("previous rebase directory %s still exists but mbox given."),
1191 if (resume
== RESUME_FALSE
)
1192 resume
= RESUME_APPLY
;
1196 struct argv_array paths
= ARGV_ARRAY_INIT
;
1200 die(_("Resolve operation not in progress, we are not resuming."));
1202 for (i
= 0; i
< argc
; i
++) {
1203 if (is_absolute_path(argv
[i
]) || !prefix
)
1204 argv_array_push(&paths
, argv
[i
]);
1206 argv_array_push(&paths
, mkpath("%s/%s", prefix
, argv
[i
]));
1209 am_setup(&state
, patch_format
, paths
.argv
);
1211 argv_array_clear(&paths
);
1221 case RESUME_RESOLVED
:
1231 die("BUG: invalid resume value");
1234 am_state_release(&state
);