From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:30 +0000 (+0900)
Subject: Merge branch 'js/ident-date-fix'
X-Git-Tag: v2.18.0-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0657e0f802b0e0a97738c074dd27ee47eeb3366f?ds=inline;hp=-c

Merge branch 'js/ident-date-fix'

During a "rebase -i" session, the code could give older timestamp
to commits created by later "pick" than an earlier "reword", which
has been corrected.

* js/ident-date-fix:
sequencer: reset the committer date before commits
---

0657e0f802b0e0a97738c074dd27ee47eeb3366f
diff --combined sequencer.c
index 5e3a50fafc,f0bac903a0..4ce5120e77
--- a/sequencer.c
+++ b/sequencer.c
@@@ -7,7 -7,7 +7,7 @@@
  #include "sequencer.h"
  #include "tag.h"
  #include "run-command.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "utf8.h"
  #include "cache-tree.h"
  #include "diff.h"
@@@ -127,7 -127,6 +127,7 @@@ static GIT_PATH_FUNC(rebase_path_rewrit
  static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
  static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
  static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
 +static GIT_PATH_FUNC(rebase_path_signoff, "rebase-merge/signoff")
  static GIT_PATH_FUNC(rebase_path_head_name, "rebase-merge/head-name")
  static GIT_PATH_FUNC(rebase_path_onto, "rebase-merge/onto")
  static GIT_PATH_FUNC(rebase_path_autostash, "rebase-merge/autostash")
@@@ -283,7 -282,7 +283,7 @@@ struct commit_message 
  
  static const char *short_commit_name(struct commit *commit)
  {
 -	return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
 +	return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
  }
  
  static int get_message(struct commit *commit, struct commit_message *out)
@@@ -1113,7 -1112,7 +1113,7 @@@ static int try_to_commit(struct strbuf 
  		commit_list_insert(current_head, &parents);
  	}
  
 -	if (write_cache_as_tree(tree.hash, 0, NULL)) {
 +	if (write_cache_as_tree(&tree, 0, NULL)) {
  		res = error(_("git write-tree failed to write a tree"));
  		goto out;
  	}
@@@ -1149,6 -1148,8 +1149,8 @@@
  		goto out;
  	}
  
+ 	reset_ident_date();
+ 
  	if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
  				 oid, author, opts->gpg_sign, extra)) {
  		res = error(_("failed to write commit object"));
@@@ -1475,7 -1476,7 +1477,7 @@@ static int do_pick_commit(enum todo_com
  		 * that represents the "current" state for merge-recursive
  		 * to work on.
  		 */
 -		if (write_cache_as_tree(head.hash, 0, NULL))
 +		if (write_cache_as_tree(&head, 0, NULL))
  			return error(_("your index file is unmerged."));
  	} else {
  		unborn = get_oid("HEAD", &head);
@@@ -1605,7 -1606,7 +1607,7 @@@
  		}
  	}
  
 -	if (opts->signoff)
 +	if (opts->signoff && !is_fixup(command))
  		append_signoff(&msgbuf, 0, 0);
  
  	if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
@@@ -2044,11 -2045,6 +2046,11 @@@ static int read_populate_opts(struct re
  		if (file_exists(rebase_path_verbose()))
  			opts->verbose = 1;
  
 +		if (file_exists(rebase_path_signoff())) {
 +			opts->allow_ff = 0;
 +			opts->signoff = 1;
 +		}
 +
  		read_strategy_opts(opts, &buf);
  		strbuf_release(&buf);
  
@@@ -2882,8 -2878,7 +2884,8 @@@ int sequencer_pick_revisions(struct rep
  
  		if (!get_oid(name, &oid)) {
  			if (!lookup_commit_reference_gently(&oid, 1)) {
 -				enum object_type type = sha1_object_info(oid.hash, NULL);
 +				enum object_type type = oid_object_info(&oid,
 +									NULL);
  				return error(_("%s: can't cherry-pick a %s"),
  					name, type_name(type));
  			}
@@@ -3007,7 -3002,7 +3009,7 @@@ int sequencer_make_script(FILE *out, in
  	init_revisions(&revs, NULL);
  	revs.verbose_header = 1;
  	revs.max_parents = 1;
 -	revs.cherry_pick = 1;
 +	revs.cherry_mark = 1;
  	revs.limited = 1;
  	revs.reverse = 1;
  	revs.right_only = 1;
@@@ -3032,12 -3027,8 +3034,12 @@@
  		return error(_("make_script: error preparing revisions"));
  
  	while ((commit = get_revision(&revs))) {
 +		int is_empty  = is_original_commit_empty(commit);
 +
 +		if (!is_empty && (commit->object.flags & PATCHSAME))
 +			continue;
  		strbuf_reset(&buf);
 -		if (!keep_empty && is_original_commit_empty(commit))
 +		if (!keep_empty && is_empty)
  			strbuf_addf(&buf, "%c ", comment_line_char);
  		strbuf_addf(&buf, "%s %s ", insn,
  			    oid_to_hex(&commit->object.oid));