From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jun 2020 01:06:31 +0000 (-0700)
Subject: Merge branch 'js/checkout-p-new-file'
X-Git-Tag: v2.28.0-rc0~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bdf00e66ae501c417fa33f887f2c60ef8719b2a;p=thirdparty%2Fgit.git

Merge branch 'js/checkout-p-new-file'

"git checkout -p" did not handle a newly added path at all.

* js/checkout-p-new-file:
  checkout -p: handle new files correctly
---

2bdf00e66ae501c417fa33f887f2c60ef8719b2a
diff --cc add-patch.c
index d8bfe379be,eaace1b824..f899389e2c
--- a/add-patch.c
+++ b/add-patch.c
@@@ -7,10 -7,9 +7,10 @@@
  #include "color.h"
  #include "diff.h"
  #include "compat/terminal.h"
 +#include "prompt.h"
  
  enum prompt_mode_type {
- 	PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_HUNK,
+ 	PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_ADDITION, PROMPT_HUNK,
  	PROMPT_MODE_MAX, /* must be last */
  };