Re: [PATCH 7/7] rebase (without -p): correctly calculate patches to rebase
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:54:17
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk:
quoted hunk ↗ jump to hunk
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 37c1b23..fe3fdd1 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh@@ -16,11 +16,9 @@ skip) ;; esac -test -n "$rebase_root" && root_flag=--root test -n "$keep_empty" && git_am_opt="$git_am_opt --keep-empty" -git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - --src-prefix=a/ --dst-prefix=b/ \ - --no-renames $root_flag "$revisions" | +generate_revisions | +sed -e 's/\([0-9a-f]\{40\}\)/From \1 Mon Sep 17 00:00:00 2001/' | git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" && move_to_original_branch
Just curious (as all tests pass): What does this do? It looks like format-patch is not called anymore and git-am sees only SHA1s. Does it force git-am to cherry-pick the patches? -- Hannes