Skip to content

Commit 2ef7d5a

Browse files
committed
File updation [GSOC]
I have ran tests locally for this file and tried to fix all the CI issues Lets Hope it works Signed-off-by: Arsh Srivastava <arshsrivastava00@gmail.com>
1 parent b25ea22 commit 2ef7d5a

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

t/t6439-merge-co-error-msgs.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ error: Your local changes to the following files would be overwritten by checkou
7878
rep/two
7979
Please commit your changes or stash them before you switch branches.
8080
Try using 'git checkout -m <branch>' for a quick fix.
81-
Please Note :- that using -m (merge) will not save your changes, rather would directly merge them. Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
81+
Please Note :- that using -m (merge) will not save your changes, rather would directly merge them.
82+
Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
8283
Aborting
8384
EOF
8485

@@ -102,7 +103,8 @@ error: Your local changes to the following files would be overwritten by checkou
102103
rep/two
103104
Please commit your changes or stash them before you switch branches.
104105
Try using 'git checkout -m <branch>' for a quick fix.
105-
Please Note :- that using -m (merge) will not save your changes, rather would directly merge them. Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
106+
Please Note :- that using -m (merge) will not save your changes, rather would directly merge them.
107+
Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
106108
Aborting
107109
EOF
108110

t/t7406-submodule-update.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ test_expect_success 'submodule update should fail due to local changes' '
213213
> file
214214
> Please commit your changes or stash them before you switch branches.
215215
> Try using '\''git checkout -m <branch>'\'' for a quick fix.
216-
> Please Note :- that using -m (merge) will not save your changes, rather would directly merge them. Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
216+
> Please Note :- that using -m (merge) will not save your changes, rather would directly merge them.
217+
> Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone.
217218
> Aborting
218219
> fatal: Unable to checkout OID in submodule path '\''submodule'\''
219220
EOF

unpack-trees.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
129129
msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
130130
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
131131
"Please commit your changes or stash them before you switch branches.\n"
132-
"Try using 'git checkout -m <branch>' for a quick fix. \n"
132+
"Try using 'git checkout -m <branch>' for a quick fix.\n"
133133
"Please Note :- that using -m (merge) will not save your changes, rather would directly merge them.\n"
134134
"Meaning if you are not able to resolve conflicts and does --hard reset your local changes would be gone."
135135
)

0 commit comments

Comments
 (0)